chiark / gitweb /
Merge remote-tracking branch 'remotes/dgit/dgit/sid'
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 29 Nov 2013 20:04:22 +0000 (20:04 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 29 Nov 2013 20:04:22 +0000 (20:04 +0000)
Done with merge -s ours.  We are a descendant of this, logically
speaking, although the archive version is missing .gitignore.


No differences found