Merge branch 'MDL-28195' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 07:02:03 +0000 (15:02 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 07:02:03 +0000 (15:02 +0800)
commitc430467ca836333775d5568a9b01cec75f5bb473
tree45f463f918d542e7a7e256a2b26e8630267be633
parent48ae99cbaf2c0b1f1b166892da23468c3793fc47
parent8f78cd5abc3e09d86f19ed53418f9250f85eca42
Merge branch 'MDL-28195' of git://github.com/timhunt/moodle
lib/javascript-static.js
lib/outputcomponents.php