Merge "Output wikiid/api in meta=siteinfo only when non-empty"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 2 Feb 2015 17:23:18 +0000 (17:23 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 2 Feb 2015 17:23:18 +0000 (17:23 +0000)

Trivial merge