From: William Morgan <wmorgan-sup@masanjin.net>
Date: Sun, 31 May 2009 15:59:19 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=c89a592127fc203103563b6fe4ad36670da6da0d;p=sup

Merge branch 'master' into next
---

c89a592127fc203103563b6fe4ad36670da6da0d