Merge "Update README from mediawiki.org upstream"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 19 Jan 2016 19:21:24 +0000 (19:21 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 19 Jan 2016 19:21:24 +0000 (19:21 +0000)

Trivial merge