Merge branch 'wip-mdl-45769' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jun 2014 11:25:01 +0000 (13:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jun 2014 11:25:01 +0000 (13:25 +0200)

Trivial merge