Merge "Fix API output formatting (change lines delimited with * as bold)"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 20 Feb 2013 14:55:45 +0000 (14:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 20 Feb 2013 14:55:45 +0000 (14:55 +0000)
1  2 
includes/api/ApiFormatBase.php

Simple merge