Merge branch '0.9.x' into 1.0.x

author Brion Vibber <brion@status.net>

Thu, 12 Aug 2010 19:56:23 +0000 (12:56 -0700)

committer Brion Vibber <brion@status.net>

Thu, 12 Aug 2010 19:56:23 +0000 (12:56 -0700)
author Brion Vibber <brion@status.net>
Thu, 12 Aug 2010 19:56:23 +0000 (12:56 -0700)
committer Brion Vibber <brion@status.net>
Thu, 12 Aug 2010 19:56:23 +0000 (12:56 -0700)
diff --cc README
Simple merge
diff --cc lib/common.php
Simple merge
diff --cc lib/statusnet.php
Simple merge
author	Brion Vibber <brion@status.net>
	Thu, 12 Aug 2010 19:56:23 +0000 (12:56 -0700)
committer	Brion Vibber <brion@status.net>
	Thu, 12 Aug 2010 19:56:23 +0000 (12:56 -0700)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
lib/common.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/statusnet.php	patch \|	diff1 \|	diff2 \|	blob \| history