[clanlib] 37/40: Merge branch 'upstream'

[Stephen Kitt]

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

skitt pushed a commit to branch master
in repository clanlib.

commit acb0ae00aec71ed2516030192728c3934da4f7e8
Merge: 2d1e849 a1bc1d6
Author: Stephen Kitt <steve at sk2.org>
Date:   Fri Jun 10 22:08:50 2016 +0200

    Merge branch 'upstream'


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