Merge branch 'wip-mdl-51981' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 30 Oct 2015 09:23:52 +0000 (10:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 30 Oct 2015 09:23:52 +0000 (10:23 +0100)

Trivial merge