From: David Bremner <bremner@debian.org>
Date: Tue, 20 Mar 2012 01:48:24 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.13_rc1~127
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=2ee1d8e1c70ce20728bc3faada389a4802636352;hp=2ee1d8e1c70ce20728bc3faada389a4802636352

Merge branch 'release'

Conflicts:
	NEWS

Conflicts resolved by hand for date of 0.12 release.
---