Merge branch 'master' of localhost:cobramush

author Rick Bird <nveid@bender.theari.com>

Mon, 25 Apr 2011 03:35:10 +0000 (23:35 -0400)

committer Rick Bird <nveid@bender.theari.com>

Mon, 25 Apr 2011 03:35:10 +0000 (23:35 -0400)
author Rick Bird <nveid@bender.theari.com>
Mon, 25 Apr 2011 03:35:10 +0000 (23:35 -0400)
committer Rick Bird <nveid@bender.theari.com>
Mon, 25 Apr 2011 03:35:10 +0000 (23:35 -0400)
diff --cc src/command.c
Simple merge
diff --cc src/create.c
Simple merge
author	Rick Bird <nveid@bender.theari.com>
	Mon, 25 Apr 2011 03:35:10 +0000 (23:35 -0400)
committer	Rick Bird <nveid@bender.theari.com>
	Mon, 25 Apr 2011 03:35:10 +0000 (23:35 -0400)
		1	2
src/command.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/create.c	patch \|	diff1 \|	diff2 \|	blob \| history