From: William Morgan Date: Wed, 26 Mar 2008 16:03:45 +0000 (-0700) Subject: Merge branch 'master' into next X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=0f01f585ea215b9b7f32cba0795839a848e11c01;p=sup Merge branch 'master' into next --- 0f01f585ea215b9b7f32cba0795839a848e11c01