Merge branch 'wip-MDL-52642-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 12:30:38 +0000 (13:30 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 12:30:38 +0000 (13:30 +0100)
commit17883c016be886d6c4e26d7c619c735f7fb5dcdd
treea339f52389379ee75ba7ba04ed73f06653737d58
parent795adc89af2fa3e443355490f3ed671f156b6a27
parentcfd1bcfa03f6fbee98b0bcad16afdd06ca12cbf1
Merge branch 'wip-MDL-52642-master' of git://github.com/abgreeve/moodle