Merge branch 'wip-mdl-51266' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Sep 2015 18:34:33 +0000 (20:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Sep 2015 18:34:33 +0000 (20:34 +0200)

Trivial merge