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