Merge branch 'wip-MDL-45274-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2016 23:45:48 +0000 (00:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2016 23:45:48 +0000 (00:45 +0100)

Trivial merge