Merge branch 'wip-mdl-52020' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Nov 2015 11:30:23 +0000 (12:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Nov 2015 16:56:22 +0000 (17:56 +0100)

Trivial merge