Merge "Remove externaledit/externaldiff preference"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 11 Apr 2013 16:15:27 +0000 (16:15 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 11 Apr 2013 16:15:27 +0000 (16:15 +0000)

Trivial merge