chiark / gitweb /
Merge branch 'master' into wip.remote
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 7 Nov 2013 00:14:53 +0000 (00:14 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 7 Nov 2013 00:14:53 +0000 (00:14 +0000)
commit641eeadd77583420e7ad32d6a0414a24f4fc83bb
treece8800f1d680c667e398265865de79e3922a49d4
parente7bf758b02322662a888d347d13243501d109b74
parent631c9e09a7fd22a5847173978c3d1357c1db74ea
Merge branch 'master' into wip.remote

Conflicts:
debian/changelog
dgit
debian/changelog
dgit