[med-svn] [praat] 05/05: Fix wrong merge

[Rafael Laboissière]

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

rlaboiss-guest pushed a commit to branch master
in repository praat.

commit 9fa971b212fde68b1b7af716d962078e94634c4a
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Wed Oct 8 12:01:43 2014 -0300

    Fix wrong merge
    
    Git-Dch: Ignore
---
 debian/changelog | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index bf25691..082c9e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
 praat (5.4.0-1) UNRELEASED; urgency=low
 
   * Imported Upstream version 5.4.0
-  * d/copyright: Update copyright information
 
  -- Rafael Laboissiere <rafael at laboissiere.net>  Wed, 08 Oct 2014 07:05:37 -0300
 
+praat (5.3.86-1) UNRELEASED; urgency=low
+
+  * Imported Upstream version 5.3.86
+  * d/copyright: Update copyright information
+
+ -- Rafael Laboissiere <rafael at laboissiere.net>  Wed, 01 Oct 2014 13:39:10 -0300
+
 praat (5.3.85-1) unstable; urgency=low
 
   * Imported Upstream version 5.3.85

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/praat.git