Merge branch 'wip-MDL-43470-master2' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Apr 2016 02:35:50 +0000 (04:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Apr 2016 02:35:50 +0000 (04:35 +0200)

Trivial merge