Merge "Rename BaseTemplate::clear to getClear to avoid conflicts with Example skin...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 5 Apr 2017 21:20:59 +0000 (21:20 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 5 Apr 2017 21:20:59 +0000 (21:20 +0000)

Trivial merge