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

diff --cc actions/all.php
Simple merge

diff --cc classes/User.php
Simple merge

diff --cc classes/User_group.php
Simple merge

diff --cc lib/action.php
Simple merge

diff --cc lib/apiaction.php
Simple merge

diff --cc lib/default.php
Simple merge

diff --cc lib/util.php
Simple merge

diff --cc plugins/Facebook/FacebookPlugin.php
Simple merge

diff --cc plugins/OStatus/OStatusPlugin.php
Simple merge