chiark / gitweb /
Merge branch 'nmus'
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 2 Jun 2012 10:20:39 +0000 (11:20 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 2 Jun 2012 10:20:39 +0000 (11:20 +0100)
commit6eaeb954a0224bf61f1f59521343ac491d7f7f7f
tree342fe48ad3f7efbdbde0829c5e849e28add30111
parentce354ffc5996e694ad4c156990de425ed00b535f
parentf4f510031c838d545e4cb0bc6552f5c4dce44097
Merge branch 'nmus'

Conflicts:
debian/changelog
debian/changelog