Merge "AuthManager fixups around the login→RESTART→create flow"

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

Tue, 31 May 2016 16:41:53 +0000 (16:41 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 31 May 2016 16:41:53 +0000 (16:41 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 31 May 2016 16:41:53 +0000 (16:41 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 31 May 2016 16:41:53 +0000 (16:41 +0000)
diff --cc includes/api/ApiQueryAuthManagerInfo.php
Simple merge
diff --cc includes/auth/ConfirmLinkSecondaryAuthenticationProvider.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 31 May 2016 16:41:53 +0000 (16:41 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 31 May 2016 16:41:53 +0000 (16:41 +0000)
		1	2
includes/api/ApiQueryAuthManagerInfo.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/auth/ConfirmLinkSecondaryAuthenticationProvider.php	patch \|	diff1 \|	diff2 \|	blob \| history