Merge commit 'debian/1.0.7-2'
authorBen Hutchings <ben@decadent.org.uk>
Tue, 13 Jul 2010 03:03:30 +0000 (04:03 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 13 Jul 2010 03:03:30 +0000 (04:03 +0100)
commit5bf7310498337de9c05f7b6780b29a3ef5cf6bac
treeeb39e64c97e7d5a81e0daab91727ee831e3b061d
parenta75c6d57688b6f4435bac41ffac7c3b8eab1aab1
parentca190b1a7e9a2b6d9ff99e9fd164a54583f46c75
Merge commit 'debian/1.0.7-2'

Conflicts:
debian/changelog