Merge branch 'wip-MDL-48390-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Dec 2014 17:48:53 +0000 (18:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Dec 2014 17:48:53 +0000 (18:48 +0100)

Trivial merge