Merge branch 'MDL-51483_master' of https://github.com/jinhofer/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Dec 2015 00:09:08 +0000 (01:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Dec 2015 00:09:08 +0000 (01:09 +0100)
commit7955476cab829eba2b652519817c0c5171fd5ace
tree4cf9b9484f9692e48ebc10d41ef97a74032da441
parentb5c73e6f42cf9c27325100eef0d48a840ae9737c
parent4ebdd15487b229ec852f5b575180eb4ed49c40d4
Merge branch 'MDL-51483_master' of https://github.com/jinhofer/moodle
lib/medialib.php
lib/moodlelib.php