[megaglest] 15/143: merge changelog entries

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository megaglest.

commit 432f1472d838f519d8d9a213eba7ab1b62b2a7d6
Author: Paul Wise <pabs at debian.org>
Date:   Wed Dec 14 11:00:17 2011 +0000

    merge changelog entries
---
 debian/changelog | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d0eaaf7..62b4900 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,24 +1,16 @@
-megaglest (3.6.0.1-1) UNRELEASED; urgency=low
-
-  [ Mark Vejvoda ]
-  * updated for 3.6.0 release
-
-  [ Alexander Reichle-Schmehl ]
-  * Remove myself from uploaders due to time constraints
-
- -- Alexander Reichle-Schmehl <tolimar at debian.org>  Tue, 13 Dec 2011 15:54:50 +0100
-
 megaglest (3.5.2.3-1) UNRELEASED; urgency=low
 
   [ Alexander Reichle-Schmehl ]
-  * NOT RELEASED YET
+  * Remove myself from uploaders due to time constraints
 
   [ Ansgar Burchardt ]
   * Remove myself from Uploaders.
 
   [ Mark Vejvoda ]
+  * updated for 3.6.0 release
   * renamed from glest to megaglest and changed build system to cmake
- -- Mark Vejvoda <mark_vejvoda at hotmail.com>  Wed, 25 May 2011 23:31:21 -0700
+
+ -- Mark Vejvoda <mark_vejvoda at hotmail.com>  Tue, 13 Dec 2011 15:54:50 +0100
 
 glest (3.2.2-2) unstable; urgency=low
 

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