From: Jameson Graef Rollins Date: Sun, 20 Dec 2009 16:03:19 +0000 (-0500) Subject: Merge branch 'upstream' into debian X-Git-Tag: debian-0.1-1~19^2~17 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=518c8c0d3f9d845b2e5a87e83382d61b05fc2958 Merge branch 'upstream' into debian --- 518c8c0d3f9d845b2e5a87e83382d61b05fc2958