[osm-tile-server] 20/70: Merge changelog entries

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit 431ee1740eff88fe955a1bcf4139817605325760
Author: Christopher Baines <mail at cbaines.net>
Date:   Fri Apr 17 16:05:08 2015 +0100

    Merge changelog entries
    
    As the package has not yet been released.
---
 debian/changelog | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bfcb845..d4e48b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,5 @@
 openstreetmap-carto (2.29.1-1) unstable; urgency=low
 
-  * New upstream release.
-
- -- Christopher Baines <mail at cbaines.net>  Sun, 12 Apr 2015 14:50:59 +0100
-
-openstreetmap-carto (2.13.0-1) unstable; urgency=low
-
   * Initial release (Closes: #744842)
 
- -- Christopher Baines <mail at cbaines.net>  Sun, 13 Apr 2014 17:06:44 +0100
+ -- Christopher Baines <mail at cbaines.net>  Sun, 12 Apr 2015 14:50:59 +0100

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-tile-server.git