Merge branch 'wip-MDL-19748-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Aug 2015 19:20:04 +0000 (21:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Aug 2015 19:20:04 +0000 (21:20 +0200)

Trivial merge