Merge branch 'MDL-52965_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 29 Feb 2016 07:20:44 +0000 (15:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 29 Feb 2016 07:20:44 +0000 (15:20 +0800)
commit7f1303728d693000422a03ab0d0a9c0835dff579
tree7365e9783085d85cbc87d1b455234a3228fda10f
parentda45d10a51f49630386ac9d8c73c02047a51675f
parentaa066e99f7d0abbc9c7d92832d72565a93d7441a
Merge branch 'MDL-52965_master' of git://github.com/dmonllao/moodle
lib/medialib.php