Merge commit 'origin/color'

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

Thu, 31 Jul 2008 00:16:45 +0000 (17:16 -0700)

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

Thu, 31 Jul 2008 00:16:45 +0000 (17:16 -0700)
author William Morgan <wmorgan-sup@masanjin.net>
Thu, 31 Jul 2008 00:16:45 +0000 (17:16 -0700)
committer William Morgan <wmorgan-sup@masanjin.net>
Thu, 31 Jul 2008 00:16:45 +0000 (17:16 -0700)
diff --cc bin/sup
Simple merge
diff --cc lib/sup.rb
Simple merge
author	William Morgan <wmorgan-sup@masanjin.net>
	Thu, 31 Jul 2008 00:16:45 +0000 (17:16 -0700)
committer	William Morgan <wmorgan-sup@masanjin.net>
	Thu, 31 Jul 2008 00:16:45 +0000 (17:16 -0700)
		1	2
bin/sup	patch \|	diff1 \|	diff2 \|	blob \| history
lib/sup.rb	patch \|	diff1 \|	diff2 \|	blob \| history