Merge branch 'wip-mdl-58250' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Mar 2017 03:25:01 +0000 (11:25 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Mar 2017 10:27:22 +0000 (11:27 +0100)

Trivial merge