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

author Evan Prodromou <evan@controlyourself.ca>

Mon, 2 Feb 2009 21:46:51 +0000 (16:46 -0500)

committer Evan Prodromou <evan@controlyourself.ca>

Mon, 2 Feb 2009 21:46:51 +0000 (16:46 -0500)
author Evan Prodromou <evan@controlyourself.ca>
Mon, 2 Feb 2009 21:46:51 +0000 (16:46 -0500)
committer Evan Prodromou <evan@controlyourself.ca>
Mon, 2 Feb 2009 21:46:51 +0000 (16:46 -0500)
diff --cc README
Simple merge
diff --cc lib/action.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Evan Prodromou <evan@controlyourself.ca>
	Mon, 2 Feb 2009 21:46:51 +0000 (16:46 -0500)
committer	Evan Prodromou <evan@controlyourself.ca>
	Mon, 2 Feb 2009 21:46:51 +0000 (16:46 -0500)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
lib/action.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history