Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Sat, 9 Dec 2017 02:19:06 +0000 (22:19 -0400)
committerDavid Bremner <david@tethera.net>
Sat, 9 Dec 2017 02:19:06 +0000 (22:19 -0400)
commit040c3236afcf95bead0324a48c2e0b9cd7934993
tree9732f633b47cc71797f966c9ac4113b1ebac7801
parentbe555b9d27f5675ef04edc5a34a4dc2b6dfc71ff
parentae55a86639f86ad1b547e961f71b1bde2180752d
Merge branch 'release'

Conflicts:
        NEWS

Add in NEWS from point release
NEWS
configure
debian/changelog
debian/control
emacs/notmuch-show.el
notmuch-show.c
test/T355-smime.sh
test/T450-emacs-show.sh
util/gmime-extra.h