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