Merge branch '0.7.x' into 0.8.x

author Evan Prodromou <evan@controlyourself.ca>

Sat, 7 Mar 2009 00:17:58 +0000 (16:17 -0800)

committer Evan Prodromou <evan@controlyourself.ca>

Sat, 7 Mar 2009 00:17:58 +0000 (16:17 -0800)
author Evan Prodromou <evan@controlyourself.ca>
Sat, 7 Mar 2009 00:17:58 +0000 (16:17 -0800)
committer Evan Prodromou <evan@controlyourself.ca>
Sat, 7 Mar 2009 00:17:58 +0000 (16:17 -0800)
diff --cc README
Simple merge
diff --cc classes/Notice.php
Simple merge
diff --cc lib/action.php
Simple merge
diff --cc lib/router.php
Simple merge
author	Evan Prodromou <evan@controlyourself.ca>
	Sat, 7 Mar 2009 00:17:58 +0000 (16:17 -0800)
committer	Evan Prodromou <evan@controlyourself.ca>
	Sat, 7 Mar 2009 00:17:58 +0000 (16:17 -0800)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
classes/Notice.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/action.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/router.php	patch \|	diff1 \|	diff2 \|	blob \| history