From: William Morgan <wmorgan-sup@masanjin.net>
Date: Wed, 20 May 2009 18:48:14 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=4059dd2f2f3f953c211cf1b3b416314c5923bc93;p=sup

Merge branch 'master' into next
---

4059dd2f2f3f953c211cf1b3b416314c5923bc93