From: William Morgan <wmorgan-sup@masanjin.net>
Date: Mon, 15 Jun 2009 16:31:45 +0000 (-0400)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=14cd17b3a1d4448282dc97c10a0063b575bf2e07;p=sup

Merge branch 'master' into next
---

14cd17b3a1d4448282dc97c10a0063b575bf2e07