Merge "Update OOjs to v1.1.7"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 29 Apr 2015 02:37:39 +0000 (02:37 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 29 Apr 2015 02:37:39 +0000 (02:37 +0000)

Trivial merge