[freeorion] 01/02: Merge branch 'master' into stretch-backports

[Markus Koschany]

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

apo pushed a commit to branch stretch-backports
in repository freeorion.

commit 70e2e8b718d290766319b3009f561ccbf8a9b4f3
Merge: 0bef090 366627a
Author: Markus Koschany <apo at debian.org>
Date:   Thu Sep 21 01:21:59 2017 +0200

    Merge branch 'master' into stretch-backports

 debian/changelog | 7 ++++---
 debian/control   | 2 +-
 debian/rules     | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

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