Merge pull request #2334 from fabrixxm/feature_autoloader

author Tobias Diekershoff <tobias.diekershoff@gmx.net>

Sat, 13 Feb 2016 11:27:24 +0000 (12:27 +0100)

committer Tobias Diekershoff <tobias.diekershoff@gmx.net>

Sat, 13 Feb 2016 11:27:24 +0000 (12:27 +0100)
author Tobias Diekershoff <tobias.diekershoff@gmx.net>
Sat, 13 Feb 2016 11:27:24 +0000 (12:27 +0100)
committer Tobias Diekershoff <tobias.diekershoff@gmx.net>
Sat, 13 Feb 2016 11:27:24 +0000 (12:27 +0100)
diff --cc include/api.php
Simple merge
diff --cc include/dfrn.php
Simple merge
author	Tobias Diekershoff <tobias.diekershoff@gmx.net>
	Sat, 13 Feb 2016 11:27:24 +0000 (12:27 +0100)
committer	Tobias Diekershoff <tobias.diekershoff@gmx.net>
	Sat, 13 Feb 2016 11:27:24 +0000 (12:27 +0100)
		1	2
include/api.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/dfrn.php	patch \|	diff1 \|	diff2 \|	blob \| history