Stupid merge conflicts, fix r96537
authorChad Horohoe <demon@users.mediawiki.org>
Thu, 8 Sep 2011 01:54:27 +0000 (01:54 +0000)
committerChad Horohoe <demon@users.mediawiki.org>
Thu, 8 Sep 2011 01:54:27 +0000 (01:54 +0000)
commit34e0645068ede89bfdcf2acf1e934a716a1a8f52
tree2bb702a7dd0aabd3bf02217b7da68bc110c6536f
parent51dcadd537baa9bc0aaf7b69fbbba866451e1afe
Stupid merge conflicts, fix r96537
maintenance/doMaintenance.php