Merge branch '0.8.x' of git://gitorious.org/laconica/fmarani-clone into fmarani/0.8.x

author Evan Prodromou <evan@controlyourself.ca>

Thu, 2 Apr 2009 10:23:50 +0000 (06:23 -0400)

committer Evan Prodromou <evan@controlyourself.ca>

Thu, 2 Apr 2009 10:23:50 +0000 (06:23 -0400)
author Evan Prodromou <evan@controlyourself.ca>
Thu, 2 Apr 2009 10:23:50 +0000 (06:23 -0400)
committer Evan Prodromou <evan@controlyourself.ca>
Thu, 2 Apr 2009 10:23:50 +0000 (06:23 -0400)
diff --cc config.php.sample
Simple merge
diff --cc lib/util.php
Simple merge
author	Evan Prodromou <evan@controlyourself.ca>
	Thu, 2 Apr 2009 10:23:50 +0000 (06:23 -0400)
committer	Evan Prodromou <evan@controlyourself.ca>
	Thu, 2 Apr 2009 10:23:50 +0000 (06:23 -0400)
		1	2
config.php.sample	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history