From: David Bremner <bremner@debian.org>
Date: Wed, 14 Mar 2012 01:09:56 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.13_rc1~160
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0c20878ccefec1e6fc472851395a7ee5a0daec4e;p=notmuch.git

Merge branch 'release'
---

0c20878ccefec1e6fc472851395a7ee5a0daec4e