Merge "Use STRAIGHT_JOIN on updateCollation.php per jcrespo"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 11 May 2016 17:04:27 +0000 (17:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 11 May 2016 17:04:27 +0000 (17:04 +0000)

Trivial merge