Merge branch '0.7.x' into 0.8.x

author Evan Prodromou <evan@controlyourself.ca>

Mon, 30 Mar 2009 15:18:03 +0000 (11:18 -0400)

committer Evan Prodromou <evan@controlyourself.ca>

Mon, 30 Mar 2009 15:18:03 +0000 (11:18 -0400)
author Evan Prodromou <evan@controlyourself.ca>
Mon, 30 Mar 2009 15:18:03 +0000 (11:18 -0400)
committer Evan Prodromou <evan@controlyourself.ca>
Mon, 30 Mar 2009 15:18:03 +0000 (11:18 -0400)
diff --cc README
Simple merge
diff --cc lib/router.php
Simple merge
author	Evan Prodromou <evan@controlyourself.ca>
	Mon, 30 Mar 2009 15:18:03 +0000 (11:18 -0400)
committer	Evan Prodromou <evan@controlyourself.ca>
	Mon, 30 Mar 2009 15:18:03 +0000 (11:18 -0400)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
lib/router.php	patch \|	diff1 \|	diff2 \|	blob \| history