[freeorion] 01/02: Merge branch 'master' into vivid-ppa

[Markus Koschany]

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

apo-guest pushed a commit to branch vivid-ppa
in repository freeorion.

commit 9de08feda630aa5d168573e8bbc3a9feb3ca666b
Merge: 5f57b7d cf70bb6
Author: Markus Koschany <apo at gambaru.de>
Date:   Tue Sep 8 17:32:26 2015 +0200

    Merge branch 'master' into vivid-ppa

 debian/changelog | 6 ++++++
 debian/rules     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 93ea353,26ac6e5..1a861d0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ freeorion (0.4.5-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Markus Koschany <apo at gambaru.de>  Tue, 08 Sep 2015 15:28:33 +0200
+ 
 +freeorion (0.4.5~RC1-1~ppa1~vivid1) vivid; urgency=medium
 +
 +  * Rebuild for Vivid.
 +
 + -- Markus Koschany <apo at gambaru.de>  Sun, 30 Aug 2015 12:55:45 +0200
 +
  freeorion (0.4.5~RC1-1) unstable; urgency=medium
  
    * New upstream release candidate.

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