Merge branch 'wip-mdl-45889' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Jul 2014 22:21:21 +0000 (00:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Jul 2014 22:21:21 +0000 (00:21 +0200)

Trivial merge