Merge branch 'wip-mdl-51322' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Sep 2015 06:21:45 +0000 (08:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Sep 2015 06:21:45 +0000 (08:21 +0200)

Trivial merge