Merge branch 'MDL-43243-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Dec 2013 22:56:01 +0000 (11:56 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Dec 2013 22:56:01 +0000 (11:56 +1300)
1  2 
lib/javascript-static.js

Simple merge