Merge branch 'wip-MDL-41288-fix' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Sep 2013 12:16:14 +0000 (14:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Sep 2013 12:16:14 +0000 (14:16 +0200)

Trivial merge