From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 29 Nov 2013 20:04:22 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/dgit/dgit/sid'
X-Git-Tag: debian/4.3.0~11
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=c46b09429cb3309bfb32fd57c294c9dc4d5cf6e9

Merge remote-tracking branch 'remotes/dgit/dgit/sid'

Done with merge -s ours.  We are a descendant of this, logically
speaking, although the archive version is missing .gitignore.
---

c46b09429cb3309bfb32fd57c294c9dc4d5cf6e9