Merge r97771, r97775
authorSam Reed <reedy@users.mediawiki.org>
Mon, 3 Oct 2011 13:37:47 +0000 (13:37 +0000)
committerSam Reed <reedy@users.mediawiki.org>
Mon, 3 Oct 2011 13:37:47 +0000 (13:37 +0000)
commitf639abf12e51c0abc524b7cca7207241d06b3089
tree4b74d17677a49222dc03f27b531f07ecdf2077cf
parentb9ac05614082faf75060e9e4aa0303cb1eb4c34b
Merge r97771, r97775
includes/DefaultSettings.php
includes/resourceloader/ResourceLoaderFileModule.php