Merge branch 'master' of http://nmbug.notmuchmail.org/git/nmbug-tags
authorDavid Edmondson <dme@dme.org>
Wed, 10 Feb 2016 14:03:53 +0000 (14:03 +0000)
committerDavid Edmondson <dme@dme.org>
Wed, 10 Feb 2016 14:03:53 +0000 (14:03 +0000)

Trivial merge