From: William Morgan <wmorgan-sup@masanjin.net>
Date: Sun, 3 Feb 2008 04:53:50 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=a6a34697a08d2c177d4bdc7178f77c6ababbed3d;p=sup

Merge branch 'master' into next
---

a6a34697a08d2c177d4bdc7178f77c6ababbed3d