From: William Morgan <wmorgan-sup@masanjin.net>
Date: Sat, 22 Aug 2009 14:49:59 +0000 (-0400)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=870add70011621d8ea09acfccb3cc3e0c945daeb;p=sup

Merge branch 'master' into next
---

870add70011621d8ea09acfccb3cc3e0c945daeb