Merge "(bug 40541) Fixed $wgSecureLogin functionality."

author Catrope <roan.kattouw@gmail.com>

Fri, 28 Sep 2012 20:30:15 +0000 (20:30 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 28 Sep 2012 20:30:15 +0000 (20:30 +0000)
author Catrope <roan.kattouw@gmail.com>
Fri, 28 Sep 2012 20:30:15 +0000 (20:30 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 28 Sep 2012 20:30:15 +0000 (20:30 +0000)
diff --cc includes/SkinTemplate.php
Simple merge
diff --cc includes/User.php
Simple merge
diff --cc includes/specials/SpecialUserlogin.php
Simple merge
author	Catrope <roan.kattouw@gmail.com>
	Fri, 28 Sep 2012 20:30:15 +0000 (20:30 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 28 Sep 2012 20:30:15 +0000 (20:30 +0000)
		1	2
includes/SkinTemplate.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/User.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/specials/SpecialUserlogin.php	patch \|	diff1 \|	diff2 \|	blob \| history