Merge branch '0.8.x' into userdesign

author Zach Copley <zach@controlyourself.ca>

Sun, 14 Jun 2009 00:23:48 +0000 (00:23 +0000)

committer Zach Copley <zach@controlyourself.ca>

Sun, 14 Jun 2009 00:23:48 +0000 (00:23 +0000)
author Zach Copley <zach@controlyourself.ca>
Sun, 14 Jun 2009 00:23:48 +0000 (00:23 +0000)
committer Zach Copley <zach@controlyourself.ca>
Sun, 14 Jun 2009 00:23:48 +0000 (00:23 +0000)
diff --cc actions/replies.php
Simple merge
diff --cc lib/noticelist.php
Simple merge
author	Zach Copley <zach@controlyourself.ca>
	Sun, 14 Jun 2009 00:23:48 +0000 (00:23 +0000)
committer	Zach Copley <zach@controlyourself.ca>
	Sun, 14 Jun 2009 00:23:48 +0000 (00:23 +0000)
		1	2
actions/replies.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/noticelist.php	patch \|	diff1 \|	diff2 \|	blob \| history