Merge branch 'wip-mdl-48117' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Oct 2015 11:33:10 +0000 (13:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Oct 2015 14:59:05 +0000 (16:59 +0200)

Trivial merge