]> git.cworth.org Git - notmuch/commitdiff
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)
Conflicts:
NEWS
bindings/python/notmuch/database.py
bindings/python/notmuch/message.py
notmuch.1

NEWS merged by hand, others taken from master.


No differences found