From: William Morgan Date: Tue, 28 Jul 2009 15:15:27 +0000 (-0400) Subject: Merge branch 'master' into next X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=efedd495db72618aa9af9a576963abbbf69aaf97;p=sup Merge branch 'master' into next --- efedd495db72618aa9af9a576963abbbf69aaf97