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)
commit23d142ef5a9bbae9705637b67aa32dcb7308f544
tree792fe28b14ae9e0eccdcc642b13924d984d5f9db
parentbaa1c694088940ba86c48d9a7288670cabcc3e23
parent051548b897dd86bc5386e85c0e66a9fa888fde9d
Merge branch 'MDL-44361-master' of git://github.com/andrewnicols/moodle
lib/javascript-static.js
lib/thirdpartylibs.xml