Merge commit '0.11.1'
authorDavid Bremner <bremner@debian.org>
Sat, 4 Feb 2012 17:01:46 +0000 (12:01 -0500)
committerDavid Bremner <bremner@debian.org>
Sat, 4 Feb 2012 17:01:46 +0000 (12:01 -0500)
commitd43f6c00b351424e903c2f2b71c34bc5902b467e
tree17a4f90bd3aa1b5d31e169a790d137831dbf37ce
parent8281430558c1b2eafc847620cd84f5ce40bf6741
parentf38bc44653ad910abb95add6b09321da11f50581
Merge commit '0.11.1'

Conflicts:
NEWS
bindings/python/notmuch/database.py
bindings/python/notmuch/message.py
notmuch.1

NEWS merged by hand, others taken from master.
NEWS
emacs/notmuch-mua.el
test/emacs