Merge "Replace a few more logical operators"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 27 Oct 2014 17:59:06 +0000 (17:59 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 27 Oct 2014 17:59:06 +0000 (17:59 +0000)

Trivial merge