Merge "PHPUnit/Framework.php was removed in 2010"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 21 Feb 2013 18:57:16 +0000 (18:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 21 Feb 2013 18:57:16 +0000 (18:57 +0000)

Trivial merge