Merge "Add API output skin"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 24 Sep 2014 15:20:41 +0000 (15:20 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 24 Sep 2014 15:20:41 +0000 (15:20 +0000)
1  2 
includes/AutoLoader.php
includes/Setup.php

Simple merge
Simple merge