Merge branch 'MDL-46477' of https://github.com/shashirepo/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Aug 2014 00:23:56 +0000 (02:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Aug 2014 00:23:56 +0000 (02:23 +0200)

Trivial merge