Merge branch 'MDL-54805-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Jun 2016 16:06:36 +0000 (18:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Jun 2016 16:06:36 +0000 (18:06 +0200)
commitccbb50d2e2e3a64b61bfdbe7541bc07adac00321
tree03829bf21b5a9b4232d86e599b9c7834d2d4123c
parent4bfeaf2d5f5c52cc6c8cdfbe79b133ad83a45288
parentb96c9a1abec93b7963aa889c9108c2298a132791
Merge branch 'MDL-54805-master' of git://github.com/junpataleta/moodle