Merge "API: Mark seldom-used formats as deprecated"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 15 Aug 2014 16:32:05 +0000 (16:32 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 15 Aug 2014 16:32:05 +0000 (16:32 +0000)

Trivial merge