[megaglest-data] 12/64: 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-data.

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

    merge changelog entries
---
 debian/changelog | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3df9016..dcc6cfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,5 @@
 megaglest-data (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:56:02 +0100
-
-megaglest-data (3.5.2.3-1) UNRELEASED; urgency=low
-
   [ Siegfried-Angel Gevatter Pujals ]
   * debian/langs/catala.lng:
      - Update the Catalan translation. Thanks to Narcis Garcia.
@@ -18,8 +8,10 @@ megaglest-data (3.5.2.3-1) UNRELEASED; urgency=low
   * 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:56:02 +0100
 
 glest-data (3.2.1-2) unstable; urgency=low
 

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