Merge "Remove user preference "noconvertlink""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 11 Mar 2014 10:01:16 +0000 (10:01 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 11 Mar 2014 10:01:16 +0000 (10:01 +0000)
commitc2665e4b6e615c80e4126f1ff343e7f9f3018dcc
tree4afdd05537b5a34a06873c568f258bc18303f612
parent88c1d93cb07670b971e16a6923e5c86144151fad
parent333bf3ae5b412fae1e4f57a62a220c941ef50536
Merge "Remove user preference "noconvertlink""
includes/DefaultSettings.php
includes/Preferences.php
languages/messages/MessagesEn.php
maintenance/language/messageTypes.inc
maintenance/language/messages.inc