Merge branch 'master' of git://gitorious.org/laconica/brianjesse-clone into brianjess...

author Evan Prodromou <evan@controlyourself.ca>

Wed, 8 Apr 2009 02:32:58 +0000 (22:32 -0400)

committer Evan Prodromou <evan@controlyourself.ca>

Wed, 8 Apr 2009 02:32:58 +0000 (22:32 -0400)
author Evan Prodromou <evan@controlyourself.ca>
Wed, 8 Apr 2009 02:32:58 +0000 (22:32 -0400)
committer Evan Prodromou <evan@controlyourself.ca>
Wed, 8 Apr 2009 02:32:58 +0000 (22:32 -0400)
diff --cc config.php.sample
Simple merge
diff --cc lib/action.php
Simple merge
author	Evan Prodromou <evan@controlyourself.ca>
	Wed, 8 Apr 2009 02:32:58 +0000 (22:32 -0400)
committer	Evan Prodromou <evan@controlyourself.ca>
	Wed, 8 Apr 2009 02:32:58 +0000 (22:32 -0400)
		1	2
config.php.sample	patch \|	diff1 \|	diff2 \|	blob \| history
lib/action.php	patch \|	diff1 \|	diff2 \|	blob \| history