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)
1  2 
includes/DefaultSettings.php
includes/Preferences.php
languages/messages/MessagesEn.php
maintenance/language/messageTypes.inc
maintenance/language/messages.inc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge