Merge changes I7493a329,Iaa9dd210

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

Fri, 23 Aug 2013 20:29:38 +0000 (20:29 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 23 Aug 2013 20:29:38 +0000 (20:29 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 23 Aug 2013 20:29:38 +0000 (20:29 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 23 Aug 2013 20:29:38 +0000 (20:29 +0000)
diff --cc includes/Preferences.php
Simple merge
diff --cc includes/specials/SpecialUserlogin.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 23 Aug 2013 20:29:38 +0000 (20:29 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 23 Aug 2013 20:29:38 +0000 (20:29 +0000)
		1	2
includes/Preferences.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/specials/SpecialUserlogin.php	patch \|	diff1 \|	diff2 \|	blob \| history