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)
commit628fb50c4248775d5e64cb6d600505131f40db36
tree69a453cb5cf1fb2033b1a260f0d2f097a3b4baef
parent199b033005edf5dbefe6756806976d11b6863a19
parent69d9986d1a82aedc32dfffb034b5c8cab9541be7
Merge branch 'master' of nmbug.notmuchmail.org/git/nmbug-tags