Merge branch 'release'
authorDavid Bremner <bremner@debian.org>
Tue, 20 Mar 2012 01:48:24 +0000 (22:48 -0300)
committerDavid Bremner <bremner@debian.org>
Tue, 20 Mar 2012 01:48:24 +0000 (22:48 -0300)
commit2ee1d8e1c70ce20728bc3faada389a4802636352
tree50eac08433a84be5832cf89eb610dc803b758c3f
parenteb82b4551ad0c5e808a677d886f58ba2c41f970d
parent82fd8c1a83518c49fa7c7b87c6595156106e1f79
Merge branch 'release'

Conflicts:
NEWS

Conflicts resolved by hand for date of 0.12 release.
NEWS
man/man1/notmuch-config.1
man/man1/notmuch-count.1
man/man1/notmuch-reply.1
man/man1/notmuch-search.1
man/man1/notmuch-show.1