]> git.notmuchmail.org Git - notmuch/commitdiff
Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Sun, 19 Mar 2017 00:02:42 +0000 (21:02 -0300)
committerDavid Bremner <david@tethera.net>
Sun, 19 Mar 2017 00:02:42 +0000 (21:02 -0300)
Merge in memory fixes

1  2 
lib/message.cc
notmuch-show.c

diff --cc lib/message.cc
Simple merge
diff --cc notmuch-show.c
Simple merge