From: William Morgan Date: Sun, 22 Mar 2009 17:45:54 +0000 (-0400) Subject: Merge branch 'master' into next X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=c6e1e20b3d6669e6fe5112a792af4382d60a61c8;p=sup Merge branch 'master' into next --- c6e1e20b3d6669e6fe5112a792af4382d60a61c8