Merge branch 'wip-MDL-50791-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Aug 2015 23:52:10 +0000 (01:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Aug 2015 23:52:10 +0000 (01:52 +0200)
commit0df465d10a33220d4cd5580c9986747186b998f8
treee6e832473b5d33cd23980aefd55b6dd3f5a41c2b
parentc5f05ff55184c8b677423b3d7907d680004d4820
parentf711237e05eaeec6143b900f1c25c5efc7a5d3a0
Merge branch 'wip-MDL-50791-master' of git://github.com/marinaglancy/moodle