Merge branch 'v0.4'

author Ryan Dahl <ry@tinyclouds.org>

Sat, 2 Jul 2011 03:32:41 +0000 (20:32 -0700)

committer Ryan Dahl <ry@tinyclouds.org>

Sat, 2 Jul 2011 03:32:41 +0000 (20:32 -0700)
author Ryan Dahl <ry@tinyclouds.org>
Sat, 2 Jul 2011 03:32:41 +0000 (20:32 -0700)
committer Ryan Dahl <ry@tinyclouds.org>
Sat, 2 Jul 2011 03:32:41 +0000 (20:32 -0700)
diff --cc lib/http.js
Simple merge
diff --cc lib/tty_posix.js
Simple merge
author	Ryan Dahl <ry@tinyclouds.org>
	Sat, 2 Jul 2011 03:32:41 +0000 (20:32 -0700)
committer	Ryan Dahl <ry@tinyclouds.org>
	Sat, 2 Jul 2011 03:32:41 +0000 (20:32 -0700)
		1	2
lib/http.js	patch \|	diff1 \|	diff2 \|	blob \| history
lib/tty_posix.js	patch \|	diff1 \|	diff2 \|	blob \| history