From: William Morgan <wmorgan-sup@masanjin.net>
Date: Wed, 24 Jun 2009 13:38:19 +0000 (-0400)
Subject: Merge commit 'bwalton/bw/flexible_sent'
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=ae549917ed4c6ad69b3c3b8cf696c261241cbd7d;p=sup

Merge commit 'bwalton/bw/flexible_sent'

Conflicts:

	lib/sup/poll.rb
	lib/sup/sent.rb
---

ae549917ed4c6ad69b3c3b8cf696c261241cbd7d