From: David Bremner <david@tethera.net>
Date: Sat, 26 Sep 2015 13:31:50 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.21_rc0~22
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=33c8777a967ece2dd4bbda7e83a4e07c195abf51;hp=33c8777a967ece2dd4bbda7e83a4e07c195abf51

Merge branch 'release'

bring debian specific changes into master
---