Merge "Update OOjs to v1.1.4"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 23 Jan 2015 20:34:16 +0000 (20:34 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 23 Jan 2015 20:34:16 +0000 (20:34 +0000)

Trivial merge