Merge branch 'MDL-44361-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 5 Mar 2014 03:36:16 +0000 (11:36 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 5 Mar 2014 03:36:16 +0000 (11:36 +0800)
1  2 
lib/javascript-static.js
lib/thirdpartylibs.xml

Simple merge
Simple merge