From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 5 Dec 2009 06:19:53 +0000 (-0500)
Subject: merge changes from upstream
X-Git-Tag: debian-0.1-1~19^2~19
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=e72a6176e3fc3fcf4b1696e3f0ee9cf66509fb4d

merge changes from upstream
---

e72a6176e3fc3fcf4b1696e3f0ee9cf66509fb4d