Merge branch 'MDL-43241-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 18 Dec 2013 03:26:35 +0000 (16:26 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 18 Dec 2013 03:26:35 +0000 (16:26 +1300)
commit2415e85716684ed3e2685eb91e6de4e3a67769a0
treeaff419f2f39bf29b2c73a6724d675b7376035a26
parentf77233dfaad8f1b32ee22171d3ea5a6b7278c21b
parenta4582a51a421df1c78cd8a833a2875f87cf85268
Merge branch 'MDL-43241-master' of git://github.com/andrewnicols/moodle
lib/javascript-static.js
lib/upgrade.txt