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

author Evan Prodromou <evan@status.net>

Sun, 8 Nov 2009 22:06:41 +0000 (17:06 -0500)

committer Evan Prodromou <evan@status.net>

Sun, 8 Nov 2009 22:06:41 +0000 (17:06 -0500)
author Evan Prodromou <evan@status.net>
Sun, 8 Nov 2009 22:06:41 +0000 (17:06 -0500)
committer Evan Prodromou <evan@status.net>
Sun, 8 Nov 2009 22:06:41 +0000 (17:06 -0500)
diff --cc actions/opensearch.php
Simple merge
diff --cc classes/User.php
Simple merge
diff --cc lib/action.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Sun, 8 Nov 2009 22:06:41 +0000 (17:06 -0500)
committer	Evan Prodromou <evan@status.net>
	Sun, 8 Nov 2009 22:06:41 +0000 (17:06 -0500)
		1	2
actions/opensearch.php	patch \|	diff1 \|	diff2 \|	blob \| history
classes/User.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/action.php	patch \|	diff1 \|	diff2 \|	blob \| history