Merge tag 'debian/0.11.1-1' into squeeze-backports
authorDavid Bremner <bremner@debian.org>
Wed, 15 Feb 2012 23:17:36 +0000 (19:17 -0400)
committerDavid Bremner <bremner@debian.org>
Wed, 15 Feb 2012 23:17:36 +0000 (19:17 -0400)
commit242beef7fb76fb780479cbfe84df0def935c322c
tree2ecb242ae0c3f1575253f3cba306513d587b2103
parent3cde7cf7cf3e01312992cc1aece7306e68b09b5d
parentf38bc44653ad910abb95add6b09321da11f50581
Merge tag 'debian/0.11.1-1' into squeeze-backports

notmuch Debian 0.11.1-1 upload (same as 0.11.1)

Conflicts:
debian/changelog
debian/changelog