Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Häder <haeder@hmmdeutschland.de>

diff --cc classes/File.php
Simple merge

diff --cc classes/User_group.php
Simple merge

diff --cc lib/default.php
Simple merge

diff --cc lib/imagefile.php
Simple merge

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