[megaglest] 135/143: Merge tag 'upstream/3.11.0+dfsg'

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository megaglest.

commit d09957f628920d2cbf305dc68cad282ff07c531e
Merge: 33d4d67 aef4f49
Author: Markus Koschany <apo at gambaru.de>
Date:   Sat Jan 31 17:51:07 2015 +0100

    Merge tag 'upstream/3.11.0+dfsg'
    
    Upstream version 3.11.0+dfsg
    
    # gpg: Unterschrift vom Sa 31 Jan 2015 17:51:04 CET mittels RSA-Schlüssel ID 513B51E4
    # gpg: Korrekte Unterschrift von "Markus Koschany <apo at gambaru.de>" [uneingeschränkt]
    # gpg:                     alias "Markus Koschany <markus at koschany.net>" [uneingeschränkt]

 mk/windoze/Installer/plugins/AccessControl.dll | Bin 13312 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/megaglest.git