]> git.cworth.org Git - sup/commit
Merge commit 'bwalton/bw/flexible_sent'
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Wed, 24 Jun 2009 13:38:19 +0000 (09:38 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Wed, 24 Jun 2009 13:38:19 +0000 (09:38 -0400)
commitae549917ed4c6ad69b3c3b8cf696c261241cbd7d
treef239d626fb5cf8fbde212fbf498867985d40e6c5
parentb8f7a8ea5bcb33737110caefbb81fc338d9a6b08
parent1dbbef0b78da01399d5cc81fd95d9b847910c9f0
Merge commit 'bwalton/bw/flexible_sent'

Conflicts:

lib/sup/poll.rb
lib/sup/sent.rb
bin/sup
lib/sup.rb
lib/sup/poll.rb