Merge "Make maintenance/update.php parse again under PHP 4.1.0"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 27 Feb 2013 04:02:35 +0000 (04:02 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 27 Feb 2013 04:02:35 +0000 (04:02 +0000)

Trivial merge