Merge branch 'wip-mdl-50259' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 May 2015 16:02:34 +0000 (18:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 May 2015 16:02:34 +0000 (18:02 +0200)

Trivial merge