From: William Morgan Date: Fri, 5 Jun 2009 14:40:51 +0000 (-0400) Subject: Merge branch 'master' into next X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=8f2c6a2081d78732ac2e0cfe5c713cb580595c33;p=sup Merge branch 'master' into next --- 8f2c6a2081d78732ac2e0cfe5c713cb580595c33