Merge branch 'master' into next

author William Morgan <wmorgan-sup@masanjin.net>

Mon, 15 Jun 2009 16:31:45 +0000 (12:31 -0400)

committer William Morgan <wmorgan-sup@masanjin.net>

Mon, 15 Jun 2009 16:31:45 +0000 (12:31 -0400)
author William Morgan <wmorgan-sup@masanjin.net>
Mon, 15 Jun 2009 16:31:45 +0000 (12:31 -0400)
committer William Morgan <wmorgan-sup@masanjin.net>
Mon, 15 Jun 2009 16:31:45 +0000 (12:31 -0400)
diff --cc bin/sup
Simple merge
diff --cc lib/sup.rb
Simple merge
diff --cc lib/sup/message-chunks.rb
Simple merge
diff --cc lib/sup/message.rb
Simple merge
author	William Morgan <wmorgan-sup@masanjin.net>
	Mon, 15 Jun 2009 16:31:45 +0000 (12:31 -0400)
committer	William Morgan <wmorgan-sup@masanjin.net>
	Mon, 15 Jun 2009 16:31:45 +0000 (12:31 -0400)
		1	2
bin/sup	patch \|	diff1 \|	diff2 \|	blob \| history
lib/sup.rb	patch \|	diff1 \|	diff2 \|	blob \| history
lib/sup/message-chunks.rb	patch \|	diff1 \|	diff2 \|	blob \| history
lib/sup/message.rb	patch \|	diff1 \|	diff2 \|	blob \| history