Merge "Allow override of extension directory"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 6 May 2015 18:52:27 +0000 (18:52 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 6 May 2015 18:52:27 +0000 (18:52 +0000)

Trivial merge