Merge branch 'wip-mdl-55043' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jul 2016 01:19:08 +0000 (03:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jul 2016 01:19:08 +0000 (03:19 +0200)

Trivial merge