Merge branch 'wip-mdl-45461' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 May 2014 09:31:54 +0000 (11:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 May 2014 09:31:54 +0000 (11:31 +0200)

Trivial merge