Merge "Call method with the same name it's defined with"

author Brian Wolff <bawolff+wn@gmail.com>

Sat, 16 Nov 2013 02:08:20 +0000 (02:08 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sat, 16 Nov 2013 02:08:20 +0000 (02:08 +0000)
author Brian Wolff <bawolff+wn@gmail.com>
Sat, 16 Nov 2013 02:08:20 +0000 (02:08 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sat, 16 Nov 2013 02:08:20 +0000 (02:08 +0000)
diff --cc includes/specials/SpecialUserlogin.php
Simple merge
author	Brian Wolff <bawolff+wn@gmail.com>
	Sat, 16 Nov 2013 02:08:20 +0000 (02:08 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sat, 16 Nov 2013 02:08:20 +0000 (02:08 +0000)