Merge branch '0.7.x' into 0.8.x

author Sarven Capadisli <csarven@controlyourself.ca>

Mon, 30 Mar 2009 15:15:40 +0000 (15:15 +0000)

committer Sarven Capadisli <csarven@controlyourself.ca>

Mon, 30 Mar 2009 15:15:40 +0000 (15:15 +0000)
author Sarven Capadisli <csarven@controlyourself.ca>
Mon, 30 Mar 2009 15:15:40 +0000 (15:15 +0000)
committer Sarven Capadisli <csarven@controlyourself.ca>
Mon, 30 Mar 2009 15:15:40 +0000 (15:15 +0000)
diff --cc README
Simple merge
diff --cc lib/router.php
Simple merge
author	Sarven Capadisli <csarven@controlyourself.ca>
	Mon, 30 Mar 2009 15:15:40 +0000 (15:15 +0000)
committer	Sarven Capadisli <csarven@controlyourself.ca>
	Mon, 30 Mar 2009 15:15:40 +0000 (15:15 +0000)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
lib/router.php	patch \|	diff1 \|	diff2 \|	blob \| history