From: David Bremner <bremner@debian.org>
Date: Wed, 23 Nov 2011 20:02:47 +0000 (-0400)
Subject: Merge branch 'release'
X-Git-Tag: 0.11_rc1~113
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b5803e918dbf772536de2bd1017e8888c01bd5a9;p=notmuch.git

Merge branch 'release'
---

b5803e918dbf772536de2bd1017e8888c01bd5a9