From: William Morgan Date: Fri, 4 Sep 2009 15:21:27 +0000 (-0400) Subject: Merge branch 'master' into next X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=fb1f9e01c6985356058190bb8cf16b9bceb0adcc;p=sup Merge branch 'master' into next --- fb1f9e01c6985356058190bb8cf16b9bceb0adcc