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)
1  2 
lib/javascript-static.js
lib/outputcomponents.php

Simple merge
Simple merge