Merge branch 'wip-MDL-49439-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Mar 2015 10:58:35 +0000 (11:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Mar 2015 10:58:35 +0000 (11:58 +0100)

Trivial merge