Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

author Sarven Capadisli <csarven@controlyourself.ca>

Wed, 11 Feb 2009 16:53:01 +0000 (16:53 +0000)

committer Sarven Capadisli <csarven@controlyourself.ca>

Wed, 11 Feb 2009 16:53:01 +0000 (16:53 +0000)
author Sarven Capadisli <csarven@controlyourself.ca>
Wed, 11 Feb 2009 16:53:01 +0000 (16:53 +0000)
committer Sarven Capadisli <csarven@controlyourself.ca>
Wed, 11 Feb 2009 16:53:01 +0000 (16:53 +0000)
diff --cc actions/showgroup.php
Simple merge
diff --cc actions/showstream.php
Simple merge
author	Sarven Capadisli <csarven@controlyourself.ca>
	Wed, 11 Feb 2009 16:53:01 +0000 (16:53 +0000)
committer	Sarven Capadisli <csarven@controlyourself.ca>
	Wed, 11 Feb 2009 16:53:01 +0000 (16:53 +0000)
		1	2
actions/showgroup.php	patch \|	diff1 \|	diff2 \|	blob \| history
actions/showstream.php	patch \|	diff1 \|	diff2 \|	blob \| history