Merge "Preferences: Turn stubthreshold back into a combo box"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 22 Jul 2014 15:55:38 +0000 (15:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 22 Jul 2014 15:55:38 +0000 (15:55 +0000)

Trivial merge