Merge conflict fix from r90096.
authorKrinkle <krinkle@users.mediawiki.org>
Tue, 14 Jun 2011 22:51:47 +0000 (22:51 +0000)
committerKrinkle <krinkle@users.mediawiki.org>
Tue, 14 Jun 2011 22:51:47 +0000 (22:51 +0000)
commit33e3d23c56bdfdb86e4fd5223c094aa53d43fc57
treea4982acffb465b93baee877dc4d7bf89a0b2da2d
parentb3621a2826992c8df009b90dfbc1fb59ef4a55c2
Merge conflict fix from r90096.
includes/resourceloader/ResourceLoaderStartUpModule.php