Merge remote branch 'gitorious/0.9.x' into 1.0.x

Conflicts:
	lib/common.php

diff --cc EVENTS.txt
Simple merge

diff --cc classes/Memcached_DataObject.php
Simple merge

diff --cc classes/Notice.php
Simple merge

diff --cc classes/Notice_tag.php
Simple merge

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

diff --cc plugins/OStatus/classes/Ostatus_profile.php
Simple merge