From: William Morgan Date: Wed, 5 Aug 2009 19:55:42 +0000 (-0400) Subject: Merge branch 'master' into next X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=018591496912c641eb89abad4f6cff855d49d9eb;p=sup Merge branch 'master' into next --- 018591496912c641eb89abad4f6cff855d49d9eb