Merge "Allow fields to define their own merge strategy via callback."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 9 Mar 2017 21:32:46 +0000 (21:32 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 9 Mar 2017 21:32:46 +0000 (21:32 +0000)

Trivial merge