Merge "ResourceLoaderFileModule::extractBasePaths: Simplify if condition"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 7 Aug 2014 10:35:39 +0000 (10:35 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 7 Aug 2014 10:35:39 +0000 (10:35 +0000)

Trivial merge