Merge branch 'master' into next

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

Mon, 18 May 2009 15:21:22 +0000 (11:21 -0400)

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

Mon, 18 May 2009 15:21:22 +0000 (11:21 -0400)
author William Morgan <wmorgan-sup@masanjin.net>
Mon, 18 May 2009 15:21:22 +0000 (11:21 -0400)
committer William Morgan <wmorgan-sup@masanjin.net>
Mon, 18 May 2009 15:21:22 +0000 (11:21 -0400)
diff --cc bin/sup-sync

index 9c342d25693f908e26825c3d7c4348e0b5ba84ee,fe729533033068288b0d90662ccca161c7f32a1c..9c342d25693f908e26825c3d7c4348e0b5ba84ee

mode 100644,100755..100755
--- 1/bin/sup-sync
--- 2/bin/sup-sync
+++ b/bin/sup-sync
diff --cc lib/sup/index.rb
Simple merge
author	William Morgan <wmorgan-sup@masanjin.net>
	Mon, 18 May 2009 15:21:22 +0000 (11:21 -0400)
committer	William Morgan <wmorgan-sup@masanjin.net>
	Mon, 18 May 2009 15:21:22 +0000 (11:21 -0400)
		1	2
bin/sup-sync	patch \|	diff1 \|	diff2 \|	blob \| history
lib/sup/index.rb	patch \|	diff1 \|	diff2 \|	blob \| history