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

Merge branch 'master' into next

Conflicts:

	lib/sup/sent.rb
---

587964eb45aed7c2d1f05ecefe52461d032c679c