From: David Bremner <bremner@debian.org>
Date: Sat, 14 Jan 2012 00:52:01 +0000 (-0400)
Subject: Merge branch 'release'
X-Git-Tag: debian/0.12_rc1-1~219
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=0bbfc5ce8be91b881d9542d86aceec7e6a716e86;hp=0bbfc5ce8be91b881d9542d86aceec7e6a716e86

Merge branch 'release'

Conflicts:
	notmuch-reply.c
	notmuch.1
---