Merge branch 'wip-MDL-53538-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Sat, 26 Mar 2016 03:37:35 +0000 (11:37 +0800)
committerDan Poltawski <dan@moodle.com>
Sat, 26 Mar 2016 03:37:35 +0000 (11:37 +0800)

Trivial merge