Merge branch 'wip-mdl-50675' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Jun 2015 16:25:55 +0000 (18:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Jun 2015 16:25:55 +0000 (18:25 +0200)

Trivial merge