Merge branch 'wip-mdl-52540' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Dec 2015 09:18:34 +0000 (10:18 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Dec 2015 09:18:34 +0000 (10:18 +0100)

Trivial merge