From: David Bremner <bremner@debian.org>
Date: Sat, 3 Mar 2012 15:56:36 +0000 (-0400)
Subject: Merge branch 'release'
X-Git-Tag: 0.13_rc1~164
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=ad6a6edb38e428f7bbcd81b49fd2ef1e5197f8c7;hp=-c

Merge branch 'release'
---

ad6a6edb38e428f7bbcd81b49fd2ef1e5197f8c7