Merge r97670, r98206
authorSam Reed <reedy@users.mediawiki.org>
Mon, 3 Oct 2011 13:41:50 +0000 (13:41 +0000)
committerSam Reed <reedy@users.mediawiki.org>
Mon, 3 Oct 2011 13:41:50 +0000 (13:41 +0000)
commiteacecf4ed22670a46b15935ffa874227af365616
treecfd4db2c6e7ec4bd13fd544302d9813ddba6ce4e
parentf639abf12e51c0abc524b7cca7207241d06b3089
Merge r97670, r98206
includes/Skin.php
includes/resourceloader/ResourceLoaderFileModule.php