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

Merge branch 'master' into next
---

0b5543a02c5d2dfc1a725e63e4a922bea9f903fd