From: William Morgan <wmorgan-sup@masanjin.net>
Date: Wed, 9 Jan 2008 18:37:52 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=75429eec816c990462653dfec45893348cd6e9bf;p=sup

Merge branch 'master' into next
---

75429eec816c990462653dfec45893348cd6e9bf