]> git.notmuchmail.org Git - notmuch/commitdiff
Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Wed, 28 May 2014 12:50:32 +0000 (09:50 -0300)
committerDavid Bremner <david@tethera.net>
Wed, 28 May 2014 12:50:32 +0000 (09:50 -0300)
A point release is slowly being built on branch release. Merge those
changes into master.

1  2 
Makefile.local
emacs/notmuch.el

diff --cc Makefile.local
Simple merge
Simple merge