[fenix] 124/127: Merge branch 'upstream'

[Peter Pentchev]

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

roam-guest pushed a commit to branch master
in repository fenix.

commit c5bb2ea29eb42c5f7e2692f3285c9c3578caaff7
Merge: 33b1acd ab4366b
Author: Peter Pentchev <roam at ringlet.net>
Date:   Thu Dec 17 16:03:17 2015 +0200

    Merge branch 'upstream'


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