Merge "Add new authentication-related hooks (and remove one) replacing some AuthPlugi...

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Tue, 22 Sep 2015 07:32:03 +0000 (07:32 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 22 Sep 2015 07:32:03 +0000 (07:32 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 22 Sep 2015 07:32:03 +0000 (07:32 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 22 Sep 2015 07:32:03 +0000 (07:32 +0000)
diff --cc RELEASE-NOTES-1.26
Simple merge
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/GlobalFunctions.php
Simple merge
diff --cc includes/User.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 22 Sep 2015 07:32:03 +0000 (07:32 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 22 Sep 2015 07:32:03 +0000 (07:32 +0000)
		1	2
RELEASE-NOTES-1.26	patch \|	diff1 \|	diff2 \|	blob \| history
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/GlobalFunctions.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/User.php	patch \|	diff1 \|	diff2 \|	blob \| history