Merge branch '0.9.x' into 1.0.x

author Evan Prodromou <evan@status.net>

Tue, 3 Aug 2010 23:05:03 +0000 (16:05 -0700)

committer Evan Prodromou <evan@status.net>

Tue, 3 Aug 2010 23:05:03 +0000 (16:05 -0700)
author Evan Prodromou <evan@status.net>
Tue, 3 Aug 2010 23:05:03 +0000 (16:05 -0700)
committer Evan Prodromou <evan@status.net>
Tue, 3 Aug 2010 23:05:03 +0000 (16:05 -0700)
diff --cc EVENTS.txt
Simple merge
diff --cc README
Simple merge
diff --cc actions/showstream.php
Simple merge
diff --cc classes/Memcached_DataObject.php
Simple merge
diff --cc classes/User.php
Simple merge
diff --cc lib/apiaction.php
Simple merge
diff --cc lib/common.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Tue, 3 Aug 2010 23:05:03 +0000 (16:05 -0700)
committer	Evan Prodromou <evan@status.net>
	Tue, 3 Aug 2010 23:05:03 +0000 (16:05 -0700)
		1	2
EVENTS.txt	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
actions/showstream.php	patch \|	diff1 \|	diff2 \|	blob \| history
classes/Memcached_DataObject.php	patch \|	diff1 \|	diff2 \|	blob \| history
classes/User.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/apiaction.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/common.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history