From: William Morgan <wmorgan-sup@masanjin.net>
Date: Wed, 16 Jan 2008 03:06:48 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=2f4d892aaa51da20df9ebaaea24401e71d826321;p=sup

Merge branch 'master' into next

Conflicts:

	lib/sup.rb
---

2f4d892aaa51da20df9ebaaea24401e71d826321