Merge branch 'wip-MDL-47812-master2' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:05:54 +0000 (11:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:05:54 +0000 (11:05 +0200)

Trivial merge