Merge branch 'MDL-36609_master' of git://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 26 Nov 2012 01:58:13 +0000 (14:58 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 26 Nov 2012 01:58:13 +0000 (14:58 +1300)
1  2 
lib/javascript-static.js

Simple merge