From: William Morgan Date: Fri, 4 Sep 2009 14:31:36 +0000 (-0400) Subject: Merge branch 'master' into next X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=8497d187f078a10400079c3d9580d3baa7aece3b;p=sup Merge branch 'master' into next --- 8497d187f078a10400079c3d9580d3baa7aece3b