Merge branch 'MDL-54745_master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 21:13:25 +0000 (23:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 21:13:25 +0000 (23:13 +0200)
commit5fe1db394b0594a64350af8228a436147afe4a09
tree52ac845d0c93f91919a25c75a765192d76d9b7ae
parentbabfc9886caa871510ffd2eb546c0273581522de
parent0cced3ced3f69a90bdf34a6d55e1038000b1f123
Merge branch 'MDL-54745_master' of https://github.com/snake/moodle