Merge "API: Update ApiOptions docs for I45f69997"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 24 Oct 2016 21:03:44 +0000 (21:03 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 24 Oct 2016 21:03:44 +0000 (21:03 +0000)

Trivial merge