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

author Evan Prodromou <evan@controlyourself.ca>

Wed, 4 Mar 2009 19:05:58 +0000 (11:05 -0800)

committer Evan Prodromou <evan@controlyourself.ca>

Wed, 4 Mar 2009 19:05:58 +0000 (11:05 -0800)
author Evan Prodromou <evan@controlyourself.ca>
Wed, 4 Mar 2009 19:05:58 +0000 (11:05 -0800)
committer Evan Prodromou <evan@controlyourself.ca>
Wed, 4 Mar 2009 19:05:58 +0000 (11:05 -0800)
diff --cc index.php
Simple merge
diff --cc lib/common.php
Simple merge
author	Evan Prodromou <evan@controlyourself.ca>
	Wed, 4 Mar 2009 19:05:58 +0000 (11:05 -0800)
committer	Evan Prodromou <evan@controlyourself.ca>
	Wed, 4 Mar 2009 19:05:58 +0000 (11:05 -0800)
		1	2
index.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/common.php	patch \|	diff1 \|	diff2 \|	blob \| history