Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into...

author Evan Prodromou <evan@controlyourself.ca>

Wed, 1 Jul 2009 16:58:49 +0000 (12:58 -0400)

committer Evan Prodromou <evan@controlyourself.ca>

Wed, 1 Jul 2009 16:58:49 +0000 (12:58 -0400)
author Evan Prodromou <evan@controlyourself.ca>
Wed, 1 Jul 2009 16:58:49 +0000 (12:58 -0400)
committer Evan Prodromou <evan@controlyourself.ca>
Wed, 1 Jul 2009 16:58:49 +0000 (12:58 -0400)
diff --cc lib/action.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Evan Prodromou <evan@controlyourself.ca>
	Wed, 1 Jul 2009 16:58:49 +0000 (12:58 -0400)
committer	Evan Prodromou <evan@controlyourself.ca>
	Wed, 1 Jul 2009 16:58:49 +0000 (12:58 -0400)
		1	2
lib/action.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history