Merge branch '0.7.x' into 0.8.x

author Evan Prodromou <evan@controlyourself.ca>

Sun, 14 Jun 2009 22:58:19 +0000 (15:58 -0700)

committer Evan Prodromou <evan@controlyourself.ca>

Sun, 14 Jun 2009 22:58:19 +0000 (15:58 -0700)
author Evan Prodromou <evan@controlyourself.ca>
Sun, 14 Jun 2009 22:58:19 +0000 (15:58 -0700)
committer Evan Prodromou <evan@controlyourself.ca>
Sun, 14 Jun 2009 22:58:19 +0000 (15:58 -0700)
diff --cc actions/showstream.php
Simple merge
diff --cc lib/router.php
Simple merge
author	Evan Prodromou <evan@controlyourself.ca>
	Sun, 14 Jun 2009 22:58:19 +0000 (15:58 -0700)
committer	Evan Prodromou <evan@controlyourself.ca>
	Sun, 14 Jun 2009 22:58:19 +0000 (15:58 -0700)
		1	2
actions/showstream.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/router.php	patch \|	diff1 \|	diff2 \|	blob \| history