Merge branch 'w19_MDL-32849_m23_urlrewriting' of git://github.com/skodak/moodle
commit45d79572b5e3fe37c2067d32fdaa447e43f40439
authorSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 22:41:58 +0000 (9 10:41 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 22:41:58 +0000 (9 10:41 +1200)
tree16653534cb77d67d44143dddf11417ec3f6a1fe8
parent9eb54eb4d7b52c35eead3b18695707fdbc66ff97
parent18ac11b730d710311be1155357eab7faa42bfc38
Merge branch 'w19_MDL-32849_m23_urlrewriting' of git://github.com/skodak/moodle
lib/javascript-static.js
lib/outputrequirementslib.php