Merge "Remove "or other" option for stubtreshold"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 8 Jan 2014 21:31:11 +0000 (21:31 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 8 Jan 2014 21:31:11 +0000 (21:31 +0000)
1  2 
includes/Preferences.php

Simple merge