Merge "If a user logs in while not on https, then the user should be sent back to...

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

Wed, 3 Dec 2014 22:36:23 +0000 (22:36 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 3 Dec 2014 22:36:23 +0000 (22:36 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 3 Dec 2014 22:36:23 +0000 (22:36 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 3 Dec 2014 22:36:23 +0000 (22:36 +0000)
diff --cc includes/specials/SpecialUserlogin.php
Simple merge
diff --cc includes/templates/Userlogin.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 3 Dec 2014 22:36:23 +0000 (22:36 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 3 Dec 2014 22:36:23 +0000 (22:36 +0000)
		1	2
includes/specials/SpecialUserlogin.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/templates/Userlogin.php	patch \|	diff1 \|	diff2 \|	blob \| history