From: Axel Beckert <abe@deuxchevaux.org>
Date: Sun, 26 Apr 2015 02:51:49 +0000 (+0200)
Subject: Merge branch 'master' of git.deb.at:pkg/t-prot
X-Git-Tag: debian/3.4-2~2
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=3d76d3fe8f1ede365de7e60b0e1d97e7c284ec3c;hp=3cb4ee97197728cc569da259357eeaa7ed325974;p=pkg%2Ft-prot.git

Merge branch 'master' of git.deb.at:pkg/t-prot

Conflicts:
	debian/changelog
---

diff --git a/debian/changelog b/debian/changelog
index 1885558..3e5fa09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,17 @@
-t-prot (3.4-1) UNRELEASED; urgency=medium
+t-prot (3.4-2) UNRELEASED; urgency=medium
 
-  * New upstream release
-    + Fixes documentation with regards to option "merge multiple blank
-      lines to n lines" (Closes: #780779)
   * debian/rules: Set timestamp of all new files to the same time to make
     builds reproducible.
 
- -- Axel Beckert <abe@debian.org>  Tue, 14 Apr 2015 23:01:05 +0200
+ -- Axel Beckert <abe@debian.org>  Sun, 26 Apr 2015 04:51:36 +0200
+
+t-prot (3.4-1) unstable; urgency=medium
+
+  * New upstream release
+    + Fixes documentation with regards to Getopt::Long command line option
+      syntax. (Closes: #780779)
+
+ -- Axel Beckert <abe@debian.org>  Sun, 26 Apr 2015 04:34:57 +0200
 
 t-prot (3.3-1) unstable; urgency=medium