Merge branch 'direct-feed-sub' into 'master'

author mmn <mmn@hethane.se>

Mon, 14 Dec 2015 21:09:56 +0000 (21:09 +0000)

committer mmn <mmn@hethane.se>

Mon, 14 Dec 2015 21:09:56 +0000 (21:09 +0000)
author mmn <mmn@hethane.se>
Mon, 14 Dec 2015 21:09:56 +0000 (21:09 +0000)
committer mmn <mmn@hethane.se>
Mon, 14 Dec 2015 21:09:56 +0000 (21:09 +0000)
diff --cc plugins/OStatus/actions/ostatussub.php
Simple merge
diff --cc plugins/OStatus/classes/Ostatus_profile.php
Simple merge
author	mmn <mmn@hethane.se>
	Mon, 14 Dec 2015 21:09:56 +0000 (21:09 +0000)
committer	mmn <mmn@hethane.se>
	Mon, 14 Dec 2015 21:09:56 +0000 (21:09 +0000)
		1	2
plugins/OStatus/actions/ostatussub.php	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/classes/Ostatus_profile.php	patch \|	diff1 \|	diff2 \|	blob \| history