Merge branch 'MDL-49845-fix3-master' of git://github.com/gurgus/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 May 2015 09:42:08 +0000 (11:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 May 2015 09:42:08 +0000 (11:42 +0200)

Trivial merge