Merge "registration: Fix ignoring 'merge_strategy' key in manifest_version 2"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 18 Oct 2016 06:56:30 +0000 (06:56 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 18 Oct 2016 06:56:30 +0000 (06:56 +0000)

Trivial merge