]> git.notmuchmail.org Git - notmuch/commitdiff
Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Fri, 9 Sep 2016 01:18:37 +0000 (22:18 -0300)
committerDavid Bremner <david@tethera.net>
Fri, 9 Sep 2016 01:18:37 +0000 (22:18 -0300)
hand fixed conflicts with NEWS


No differences found