Merge branch 'wip.remote' of git+ssh://git.debian.org/git/dgit-repos/repos/dgit into...

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 7ba0e87027ea329509254dad722b9038d694b572,4891735bc5e03bf52a41b52b4de2f75d64b14a77..4ea1aea85f2f4d8d5c03220b79f1d0d816ea25c5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,12 +1,21 @@@
 +dgit (0.18~experimental1) experimental; urgency=low
 +
 +  * No update to code.
 +    dgit 0.17 is going to go into unstable soon, and we need to
 +     (a) test it (so this is an upload for testing); and
 +     (b) bump the version number in experimental to keep it here
 +
 + -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 06 Nov 2013 21:54:15 +0000
 +
+ dgit (0.17~experimental7) experimental; urgency=low
+ 
+   * manpage: Remove comment in BUGS about lack of policy docs
+     for Dgit field, which is specified now.  Closes:#720201.
+   * manpage: Make discussion of --existing-package less scary.  The
+     default archive access method no longer needs it.  Closes:#720171.
+ 
+  --
+ 
  dgit (0.17~experimental6) experimental; urgency=low
  
    * No update to code.  Upload to remove "DO NOT USE" indication.