Merge tag 'debian/0.12-1' into squeeze-backports
authorDavid Bremner <bremner@debian.org>
Thu, 5 Apr 2012 02:27:01 +0000 (23:27 -0300)
committerDavid Bremner <bremner@debian.org>
Thu, 5 Apr 2012 02:27:01 +0000 (23:27 -0300)
commit4adefd4c497a1977db36317ed34c406565fb201d
tree1d1d7c6cea688d8ef71f70a9a022165f60be3140
parent954cf155718a5a7576a7a578d836b76e15d312a4
parent331f0cac61802606e0103c35453656d2299cbfe3
Merge tag 'debian/0.12-1' into squeeze-backports

notmuch Debian 0.12-1 upload (same as 0.12 + debian changelog fix)

Conflicts:
debian/changelog
debian/changelog