From: William Morgan <wmorgan-sup@masanjin.net>
Date: Mon, 27 Jul 2009 16:29:57 +0000 (-0400)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=36371414243cb938b6e3821ae2d911f371d3c9c5;p=sup

Merge branch 'master' into next
---

36371414243cb938b6e3821ae2d911f371d3c9c5