From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sun, 20 Dec 2009 16:03:19 +0000 (-0500)
Subject: Merge branch 'upstream' into debian
X-Git-Tag: debian/0.0+201001211401~15
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/notmuch.git/commitdiff_plain/518c8c0d3f9d845b2e5a87e83382d61b05fc2958

Merge branch 'upstream' into debian
---

518c8c0d3f9d845b2e5a87e83382d61b05fc2958