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

Conflicts:
	debian/changelog

diff --cc debian/changelog
index fbad7e0d3059c8951c1994edaed74409d72d93c4,1885558d629ba85581afd9fb7dba39897007ecf6..3e5fa090fecadc3cf9d433b6093dd774fb83178b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -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