Merge "Revised design of Special:Userlogin"

diff --cc RELEASE-NOTES-1.22
index 5fbf064,c6c35c6..c0d4951
--- 1/RELEASE-NOTES-1.22
--- 2/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@@ -21,11 -23,10 +23,13 @@@ production
    preference). This feature was moved from the Vector extension, and is now part
    of core for all skins. Take care when upgrading that you don't use an older
    version of the Vector extension as this feature may conflict.
+ * New version of Special:UserLogin form. It is opt-in for now, controlled by
+   the $wgUseVFormUserLogin setting or a 'useNew' URL parameter trigger.
  
  === Bug fixes in 1.22 ===
 +* Disable Special:PasswordReset when $wgEnableEmail. Previously one could still
 +  navigate to the page by entering the URL directly.
 +
  
  === API changes in 1.22 ===
  * (bug 46626) xmldoublequote parameter was removed. Because of a bug, the

diff --cc includes/AutoLoader.php
Simple merge

diff --cc includes/DefaultSettings.php
Simple merge

diff --cc languages/messages/MessagesEn.php
Simple merge

diff --cc languages/messages/MessagesQqq.php
Simple merge

diff --cc maintenance/language/messages.inc
Simple merge