Merge branch 'MDL-46633' of https://github.com/shashirepo/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Sep 2014 00:12:14 +0000 (02:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Sep 2014 00:12:14 +0000 (02:12 +0200)

Trivial merge