Merge branch 'wip-MDL-50941-master' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Sat, 26 Mar 2016 03:26:31 +0000 (11:26 +0800)
committerDan Poltawski <dan@moodle.com>
Sat, 26 Mar 2016 03:26:31 +0000 (11:26 +0800)

Trivial merge