From: William Morgan Date: Sun, 31 May 2009 00:15:33 +0000 (-0700) Subject: Merge branch 'master' into next X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=95c34f38b36980e3a7ed3ae045a4879beb2cf10a;p=sup Merge branch 'master' into next --- 95c34f38b36980e3a7ed3ae045a4879beb2cf10a