Merge branch 'MDL-35954_master' of git://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:08:06 +0000 (14:08 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:08:06 +0000 (14:08 +1300)
1  2 
lib/javascript-static.js

Simple merge