[simutrans] 02/02: Merge branch 'upstream' of git://anonscm.debian.org/pkg-games/simutrans into upstream

[Markus Koschany]

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

apo-guest pushed a commit to branch upstream
in repository simutrans.

commit b246e32a65eebe7a767ad616543c10a644603fa5
Merge: d563db3 5b8fd43
Author: Markus Koschany <apo at debian.org>
Date:   Tue Feb 9 22:20:48 2016 +0100

    Merge branch 'upstream' of git://anonscm.debian.org/pkg-games/simutrans into upstream


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