Merge branch 'stable' into HEAD

diff --cc debian/changelog
index 1d57cfa9e610ca1397866cdd0877b678599c27d0,5478618ba2fac6a7de3bf5293097f8a4e24f7ae0..5978c663a65e5630806fba3d6c7dd49f46320f06
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,4 +1,18 @@@
- dgit (3.12~) unstable; urgency=medium
 +dgit (4.1~) experimental; urgency=medium
 +
 +  Internal changes:
 +  * using-these: New script to help with ad-hoc-testing.
 +
 + --
 +
 +dgit (4.0) experimental; urgency=low
 +
 +  * dgit: --deliberately-not-fast-forward works properly in
 +    split view quilt modes (suppressing the pseudomerge).
 +
 + -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 12 Feb 2017 22:22:31 +0000
 +
+ dgit (3.12) unstable; urgency=high
  
    Important bugfixes to dgit:
    * Pass --no-renames to git diff-tree -z, avoiding potential trouble.

diff --cc dgit
Simple merge