Merge branch 'wip-mdl-52949' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Feb 2016 01:30:07 +0000 (02:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Feb 2016 01:30:07 +0000 (02:30 +0100)

Trivial merge