[unknown-horizons] 08/16: Merge tag 'upstream/2017.1+ds'

[Markus Koschany]

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

apo pushed a commit to branch master
in repository unknown-horizons.

commit cda0fab3c1d39a2fb8dcff76c2c751329e39d6e8
Merge: 5b5f4bf 96d7112
Author: Markus Koschany <apo at debian.org>
Date:   Fri Jan 20 21:48:01 2017 +0000

    Merge tag 'upstream/2017.1+ds'
    
    Upstream version 2017.1+ds
    
    # gpg: Signature made Fri 20 Jan 2017 09:46:04 PM UTC using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]


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