Merge branch 'wip-mdl-49963' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Mar 2016 05:51:34 +0000 (13:51 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Mar 2016 05:51:34 +0000 (13:51 +0800)

Trivial merge