Merge remote-tracking branch 'dgit/dgit/sid' into experimental

diff --combined debian/changelog
index fc26e977693961cdf82936d3195c5892330249c5,87f86a6dbd4cda88900222caf114fa0ccd4b45a9..0f36987bda9b081fa6694d8875c945dc394ebc79
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,10 +1,22 @@@
- dgit (5.4+exp2) experimental; urgency=medium
++dgit (5.5+exp2) experimental; urgency=medium
 +
 +  * test suite: Explicit agent starting/stopping
 +
 + -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 28 Jun 2018 00:42:00 +0100
 +
+ dgit (5.5) unstable; urgency=medium
+ 
+   * Add missing comma in debian/control.  Closes:#902578.
+   * dgit(1): Fix a wrong reference to \fp, which should be \fP.
+ 
+  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 28 Jun 2018 13:25:21 +0100
+ 
 +dgit (5.4+exp1) experimental; urgency=medium
 +
 +  * No-change upload, for testing.
 +
 + -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 28 Jun 2018 00:44:52 +0100
 +
  dgit (5.4) unstable; urgency=medium
  
    Improvements: