Merge "Make constructor of Block accept array of options"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 19 Jun 2015 18:33:20 +0000 (18:33 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 19 Jun 2015 18:33:20 +0000 (18:33 +0000)

Trivial merge