Merge branch 'release'
authorDavid Bremner <bremner@debian.org>
Tue, 19 Feb 2013 00:33:48 +0000 (20:33 -0400)
committerDavid Bremner <bremner@debian.org>
Tue, 19 Feb 2013 00:33:48 +0000 (20:33 -0400)
commit16aa65ba2575fd504c31d9671d8c5150f8e8adf1
treeac2398df690fa58f584d82044d9273dbfd557b11
parent2bedb0300544bf0603863b372cb605dca40c6b33
parentbcccc2e1fe19003e28b6cd85d3f2b2beda40335f
Merge branch 'release'

add in NEWS from 0.15.2

Conflicts:
NEWS
NEWS
man/man1/notmuch.1