Merge branch 'wip-mdl-52066' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Nov 2015 22:27:50 +0000 (23:27 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Nov 2015 22:27:50 +0000 (23:27 +0100)

Trivial merge