Merge branch 'wip-MDL-57464-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 11:16:27 +0000 (11:16 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 11:16:27 +0000 (11:16 +0000)
commit25a222734ed7e56e4b9de5c600975c3a81616798
tree56b50ef9cde776cddba19f2da9df62ed070f0b28
parent5fd78ba4120e92b507693d10ef449fed7c5b96ef
parenta7eb619b76719010d2b7546a6f91cda55eee99ad
Merge branch 'wip-MDL-57464-master' of git://github.com/abgreeve/moodle