Merge branch 'wip-MDL-37946-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Jul 2016 22:19:59 +0000 (00:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Jul 2016 22:19:59 +0000 (00:19 +0200)
commit68ddadc180eafa34ec32eca2a0aa6d7f67e856fe
tree09dac0c3d6fccbe79aa7a1dbc6c6c02b56281af2
parentc145e290a37296b739f0cd9f1d0051223daa363c
parent15a237cea67ac9f56d68eb83b6ed67e6fd325c1d
Merge branch 'wip-MDL-37946-master' of https://github.com/marinaglancy/moodle