Merge "set url used in createaccount-text to main page canonical url"

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

Fri, 15 Nov 2013 20:38:41 +0000 (20:38 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

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