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

Merge branch 'master' into next
---

f71f5fe92ef8d5c25d0df93a276821226228436f