Merge "Update OOjs to v1.1.2"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 6 Nov 2014 19:04:25 +0000 (19:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 6 Nov 2014 19:04:25 +0000 (19:04 +0000)

Trivial merge