Merge branch 'MDL-60045_master-v2' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Sep 2017 06:16:02 +0000 (07:16 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Sep 2017 06:16:02 +0000 (07:16 +0100)
commit363d81514e7d600f598dba384d0e95801b404d7b
tree10e2a83043afc51037826b2a6d4567c605268cb7
parentc8d20b2a735d9e90bb6349d4ef3f3f27cdb0619d
parentfe2142952f9d440ceddffb3c2874779cf76d74ad
Merge branch 'MDL-60045_master-v2' of git://github.com/markn86/moodle