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

diff --cc lib/api.php
Simple merge

diff --cc lib/default.php
Simple merge

diff --cc lib/iomaster.php
Simple merge

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