Merge branch 'MDL-53071-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Feb 2016 10:01:15 +0000 (11:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Feb 2016 10:01:15 +0000 (11:01 +0100)
commit316d6574e2a11aa9185b8abb518ffd02aac7ad3b
tree1b983e19e45e41c8bdb25c985c3f280bde5a1135
parente8d908728d8c6c3fd3a191ded32ceeeaf630a289
parenteb66223c42bc738316fdb949b0659bd88a49229e
Merge branch 'MDL-53071-master' of git://github.com/junpataleta/moodle