Merge "Kill Dwimmerlaik"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 7 Apr 2015 20:10:21 +0000 (20:10 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 7 Apr 2015 20:10:21 +0000 (20:10 +0000)
1  2 
api.php
includes/MediaWiki.php

diff --cc api.php
Simple merge
Simple merge