chiark / gitweb /
Merge branch 'master' into wip.remote
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 22 Oct 2013 13:53:11 +0000 (14:53 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 22 Oct 2013 13:53:11 +0000 (14:53 +0100)
commit59235957912b6f55e150d533749aad62b1647e8e
tree683ce460907b8eadc3e5efc4219336094e9b9348
parent7b20daf717d8f5559908a794aab0425974934f47
parentf5cc5221e5f7298d88c384af112b33a3287a2a1a
Merge branch 'master' into wip.remote

Conflicts:
debian/changelog
dgit
debian/changelog
dgit
dgit.1