chiark / gitweb /
Merge branch 'master' of git+ssh://git.debian.org/git/dgit-repos/repos/dgit into...
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 28 Aug 2013 22:18:52 +0000 (23:18 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 28 Aug 2013 22:18:52 +0000 (23:18 +0100)
commitd1c14131ff8c1e9e0b0b005cb065a952b6631e3c
tree6f33308d8ee39e05569a0b2582804ef73e8d888e
parentfc461931e5316cbd9cad4a93b9bbac3ad69c81a4
parent28789232f5edcc1c24bbb4bfe3b5e12119e9886e
Merge branch 'master' of git+ssh://git.debian.org/git/dgit-repos/repos/dgit into dgit/experimental

Conflicts:
debian/changelog
debian/changelog