Merge "Make tableNamesWithUseIndexOrJOIN() and makeUpdateOptions() protected"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 10 Jan 2014 12:24:39 +0000 (12:24 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 10 Jan 2014 12:24:39 +0000 (12:24 +0000)

Trivial merge