[gemrb] 11/13: Merge branch 'upstream'

[Beren Minor]

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

berenm-guest pushed a commit to branch master
in repository gemrb.

commit da4abec824c9c486dcb38025b8b84e5273fb0521
Merge: cae3cc3 d42bc7a
Author: Beren Minor <beren.minor+debian at gmail.com>
Date:   Fri Aug 16 20:31:59 2013 +0200

    Merge branch 'upstream'


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