Merge branch 'wip-MDL-51999-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Nov 2015 18:59:01 +0000 (19:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Nov 2015 18:59:01 +0000 (19:59 +0100)

Trivial merge