Merge "objectcache: remove redundant merge() definitions"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 27 Mar 2019 18:34:47 +0000 (18:34 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 27 Mar 2019 18:34:47 +0000 (18:34 +0000)

Trivial merge