From: William Morgan Date: Tue, 26 May 2009 21:23:04 +0000 (-0700) Subject: Merge branch 'master' into next X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=fa0b5a25587356684bd45b82b172fedc729038d5;p=sup Merge branch 'master' into next --- fa0b5a25587356684bd45b82b172fedc729038d5