From: William Morgan Date: Mon, 20 Oct 2008 02:41:01 +0000 (-0700) Subject: Merge branch 'master' into next X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=a426c914c3734e67d161d459c23c916810755ccf;p=sup Merge branch 'master' into next --- a426c914c3734e67d161d459c23c916810755ccf