Merge "Remove unnecessary defined( 'MEDIAWIKI' ) check"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 16 Oct 2013 16:51:12 +0000 (16:51 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 16 Oct 2013 16:51:12 +0000 (16:51 +0000)

Trivial merge