Merge "Add CompositeBlock class for enforcing multiple blocks"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 12 Jun 2019 21:28:33 +0000 (21:28 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 12 Jun 2019 21:28:33 +0000 (21:28 +0000)

Trivial merge