From: William Morgan Date: Tue, 2 Jun 2009 16:43:21 +0000 (-0700) Subject: Merge branch 'master' into next X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=d200de299e8a42d202481088a202af8e72913e4a;p=sup Merge branch 'master' into next --- d200de299e8a42d202481088a202af8e72913e4a