Merge branch 'wip-mdl-49022' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Jun 2015 01:02:59 +0000 (03:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Jun 2015 01:02:59 +0000 (03:02 +0200)

Trivial merge