From: William Morgan Date: Thu, 10 Sep 2009 14:25:50 +0000 (-0400) Subject: Merge branch 'master' into next X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=9602714be5bc88611e8f42403ea248c2dbf43b69;p=sup Merge branch 'master' into next --- 9602714be5bc88611e8f42403ea248c2dbf43b69