Merge "Fixed a path issue in NoLocalSettings"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 18 Feb 2015 23:03:38 +0000 (23:03 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 18 Feb 2015 23:03:38 +0000 (23:03 +0000)

Trivial merge