Merge commit 'origin/string-split-fixes'

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

Mon, 18 May 2009 14:32:25 +0000 (07:32 -0700)

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

Mon, 18 May 2009 14:32:25 +0000 (07:32 -0700)
author William Morgan <wmorgan-sup@masanjin.net>
Mon, 18 May 2009 14:32:25 +0000 (07:32 -0700)
committer William Morgan <wmorgan-sup@masanjin.net>
Mon, 18 May 2009 14:32:25 +0000 (07:32 -0700)
diff --cc lib/sup/buffer.rb
Simple merge
diff --cc lib/sup/poll.rb
Simple merge
author	William Morgan <wmorgan-sup@masanjin.net>
	Mon, 18 May 2009 14:32:25 +0000 (07:32 -0700)
committer	William Morgan <wmorgan-sup@masanjin.net>
	Mon, 18 May 2009 14:32:25 +0000 (07:32 -0700)
		1	2
lib/sup/buffer.rb	patch \|	diff1 \|	diff2 \|	blob \| history
lib/sup/poll.rb	patch \|	diff1 \|	diff2 \|	blob \| history