Merge branch 'MDL-51483_29' of https://github.com/jinhofer/moodle into MOODLE_29_STABLE
commite794852ff57be4165d6fe4f53ba2d7298c295abd
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Dec 2015 01:22:58 +0000 (9 02:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Dec 2015 01:22:58 +0000 (9 02:22 +0100)
tree1b9a1338f9a955564eff3a97b0aeb304ab12fe7f
parentc44388a7cf9031dae0edc0f23917438c45ac494c
parentdf1e5786c232affba4ca1612d5a55e2ec54555c1
Merge branch 'MDL-51483_29' of https://github.com/jinhofer/moodle into MOODLE_29_STABLE
lib/medialib.php