From: David Bremner <bremner@unb.ca>
Date: Sun, 26 May 2013 00:20:39 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.16_rc1~116
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=f0dfda5c7797f9db81ce35d270fe0ac406c7fca1

Merge branch 'release'

merge back debian-only release into master
---

f0dfda5c7797f9db81ce35d270fe0ac406c7fca1