Merge branch '1.0.x' into schema-x

author Brion Vibber <brion@pobox.com>

Mon, 25 Oct 2010 20:14:33 +0000 (13:14 -0700)

committer Brion Vibber <brion@pobox.com>

Mon, 25 Oct 2010 20:14:33 +0000 (13:14 -0700)
author Brion Vibber <brion@pobox.com>
Mon, 25 Oct 2010 20:14:33 +0000 (13:14 -0700)
committer Brion Vibber <brion@pobox.com>
Mon, 25 Oct 2010 20:14:33 +0000 (13:14 -0700)
diff --cc classes/statusnet.ini
Simple merge
diff --cc lib/common.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Mon, 25 Oct 2010 20:14:33 +0000 (13:14 -0700)
committer	Brion Vibber <brion@pobox.com>
	Mon, 25 Oct 2010 20:14:33 +0000 (13:14 -0700)
		1	2
classes/statusnet.ini	patch \|	diff1 \|	diff2 \|	blob \| history
lib/common.php	patch \|	diff1 \|	diff2 \|	blob \| history