Merge branch 'MDL-49684-fix' of https://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Apr 2015 15:05:51 +0000 (17:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Apr 2015 15:05:51 +0000 (17:05 +0200)

Trivial merge