]> git.notmuchmail.org Git - notmuch/commitdiff
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)
Conflicts:
NEWS

Conflicts resolved by hand for date of 0.12 release.


No differences found