Merge branch 'wip-mdl-46891' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 Mar 2016 02:57:03 +0000 (03:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 Mar 2016 02:57:03 +0000 (03:57 +0100)

Trivial merge