From: William Morgan Date: Sun, 16 Aug 2009 21:02:25 +0000 (-0400) Subject: Merge branch 'master' into next X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=a8dc644c5c07cb0d00099fd0c7eb6a8443a61641;p=sup Merge branch 'master' into next --- a8dc644c5c07cb0d00099fd0c7eb6a8443a61641