Merge from sid [dgit]

diff --cc debian/changelog
index 13566063eb74de2b523935361df48bc7e64e3f91,531fbbd18f0989396488a850ff5f6da7b02580e4..57e2e09fc39753df0eb78ca293a72d13a132a62c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,11 +1,20 @@@
 +authbind (2.1.2) unstable; urgency=low
 +
 +  * Cope with programs which set SIGCHLD to SIG_IGN.  (We assume
 +    they don't manipulate SIGCHLD on other threads, which is probably
 +    true.)  Patch from Marco d'Itri, slightly modified.  Closes:#765587.
 +  * Fix one-letter typo in previous changelog entry.
 +
 + --
 +
+ authbind (2.1.1+nmu1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Fix mtimes before building binary packages to produce reproducible output
+     Based on patch by akira (Closes: #792945)
+ 
+  -- Johannes Schauer <josch@debian.org>  Sun, 26 Jul 2015 11:23:35 +0200
+ 
  authbind (2.1.1) unstable; urgency=low
  
    * Manpage has an example of which files will be checked and read