Merge branch 'MDL-43240-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Dec 2013 03:03:09 +0000 (16:03 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Dec 2013 03:03:09 +0000 (16:03 +1300)
1  2 
lib/javascript-static.js

Simple merge