Merge "Maintenance: Use __DIR__ instead of dirname( __FILE__ )"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 15 Jun 2016 10:28:11 +0000 (10:28 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 15 Jun 2016 10:28:11 +0000 (10:28 +0000)

Trivial merge