From: William Morgan Date: Mon, 8 Jun 2009 18:09:06 +0000 (-0400) Subject: Merge branch 'master' into next X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=c1f6dbce0ccdff60bee01d01fafb07167526db50;p=sup Merge branch 'master' into next --- c1f6dbce0ccdff60bee01d01fafb07167526db50