Fix conflict in r66907 (follow-up r66793) accidentally partially reverting r66858
authorAndrew Garrett <werdna@users.mediawiki.org>
Wed, 26 May 2010 05:52:43 +0000 (05:52 +0000)
committerAndrew Garrett <werdna@users.mediawiki.org>
Wed, 26 May 2010 05:52:43 +0000 (05:52 +0000)
commitc62ece653ad63e72f0eb025eaddb266cbdad2564
treea254501342941a0ac19de28fc4ae69d8e4e42218
parentd3d4b30fcae8ae2272b3b4c199419c49142745f5
Fix conflict in r66907 (follow-up r66793) accidentally partially reverting r66858
includes/RevisionDelete.php
includes/specials/SpecialRevisiondelete.php