chiark / gitweb /
Merge branch 'dgit/sid'
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 9 Nov 2014 12:19:50 +0000 (12:19 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 9 Nov 2014 12:23:08 +0000 (12:23 +0000)
commit43524bcbff468f7a21a351d4c5ac746649d82948
tree974c5ec5a5d9a103be58780149b15d24985d5ce2
parent5a6fed8444122ed6dbdef107dce32eb6344175b2
parente31501dd45b572f7e2fc01a1204cbd2889760c04
Merge branch 'dgit/sid'

Conflicts:
debian/changelog
debian/control
debian/changelog