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

Conflicts:
	plugins/OpenID/openidserver.php (cleaned up mismatched comment)

diff --cc classes/Notice.php
Simple merge

diff --cc lib/apiaction.php
Simple merge

diff --cc lib/atomgroupnoticefeed.php
Simple merge

diff --cc lib/installer.php
Simple merge

diff --cc plugins/OpenID/openidserver.php
Simple merge