Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

author Evan Prodromou <evan@status.net>

Thu, 7 Jan 2010 07:23:30 +0000 (23:23 -0800)

committer Evan Prodromou <evan@status.net>

Thu, 7 Jan 2010 07:23:30 +0000 (23:23 -0800)
author Evan Prodromou <evan@status.net>
Thu, 7 Jan 2010 07:23:30 +0000 (23:23 -0800)
committer Evan Prodromou <evan@status.net>
Thu, 7 Jan 2010 07:23:30 +0000 (23:23 -0800)
diff --cc classes/Memcached_DataObject.php
Simple merge
diff --cc plugins/UserFlag/User_flag_profile.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Thu, 7 Jan 2010 07:23:30 +0000 (23:23 -0800)
committer	Evan Prodromou <evan@status.net>
	Thu, 7 Jan 2010 07:23:30 +0000 (23:23 -0800)
		1	2
classes/Memcached_DataObject.php	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/UserFlag/User_flag_profile.php	patch \|	diff1 \|	diff2 \|	blob \| history