From: William Morgan Date: Sat, 22 Aug 2009 14:56:15 +0000 (-0400) Subject: Merge branch 'master' into next X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=20886f4b1d1f92c4db17fbd2639ba47fb8888046;p=sup Merge branch 'master' into next --- 20886f4b1d1f92c4db17fbd2639ba47fb8888046