Merge "Enforce calling HTMLForm::prepareForm before displayForm"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 27 Apr 2016 20:19:39 +0000 (20:19 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 27 Apr 2016 20:19:39 +0000 (20:19 +0000)

Trivial merge