Merge branch 'master' into nightly

author Mikael Nordfeldth <mmn@hethane.se>

Thu, 5 Nov 2015 15:07:05 +0000 (16:07 +0100)

committer Mikael Nordfeldth <mmn@hethane.se>

Thu, 5 Nov 2015 15:07:05 +0000 (16:07 +0100)
author Mikael Nordfeldth <mmn@hethane.se>
Thu, 5 Nov 2015 15:07:05 +0000 (16:07 +0100)
committer Mikael Nordfeldth <mmn@hethane.se>
Thu, 5 Nov 2015 15:07:05 +0000 (16:07 +0100)
diff --cc lib/noticelistitem.php
Simple merge
diff --cc plugins/OStatus/classes/Ostatus_profile.php
Simple merge
diff --cc plugins/Share/SharePlugin.php
Simple merge
author	Mikael Nordfeldth <mmn@hethane.se>
	Thu, 5 Nov 2015 15:07:05 +0000 (16:07 +0100)
committer	Mikael Nordfeldth <mmn@hethane.se>
	Thu, 5 Nov 2015 15:07:05 +0000 (16:07 +0100)
		1	2
lib/noticelistitem.php	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/classes/Ostatus_profile.php	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/Share/SharePlugin.php	patch \|	diff1 \|	diff2 \|	blob \| history