Merge branch 'wip-mdl-53126' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Mar 2016 20:35:03 +0000 (21:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Mar 2016 20:35:03 +0000 (21:35 +0100)

Trivial merge