chiark / gitweb /
Merge branch 'ubuntu'
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 2 Jun 2012 14:50:36 +0000 (15:50 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 2 Jun 2012 14:51:09 +0000 (15:51 +0100)
commite918757b728035b422168d54c8c08751afda8cea
tree7267d901f421668a5b2cbb42b24286463f00e58d
parent8e5b345fc6b6de1b0ed4c7a0dd1de1dc636e1fc0
parent3a33f8e25ccbfc6b211f605edc6656ff11017ab0
Merge branch 'ubuntu'

This imports the single change from 1.0.6ubuntu1

Conflicts:
.gitignore
debian/changelog
debian/changelog
debian/control