Merge branch 'wip-mdl-49150' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Mar 2016 22:10:46 +0000 (00:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Mar 2016 22:10:46 +0000 (00:10 +0200)

Trivial merge