Merge branch 'MDL-24521' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Jan 2011 22:20:30 +0000 (23:20 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Jan 2011 22:20:30 +0000 (23:20 +0100)
1  2 
lib/javascript-static.js

Simple merge