Merge branch 'wip-mdl-51555' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 25 Sep 2015 09:31:14 +0000 (11:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 25 Sep 2015 09:31:14 +0000 (11:31 +0200)

Trivial merge