From: William Morgan <wmorgan-sup@masanjin.net>
Date: Sun, 9 Mar 2008 17:44:01 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=9522fea619d19203bb81b4220097f854beb2e556;p=sup

Merge branch 'master' into next
---

9522fea619d19203bb81b4220097f854beb2e556