Merge branch 'MDL-60018-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Sep 2017 06:27:48 +0000 (07:27 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Sep 2017 06:27:48 +0000 (07:27 +0100)
commitf5cc5b321d60af07c9798d5e61eded200b43026d
tree41396d91c69c0522cc1a51396bc1332cc1296448
parent363d81514e7d600f598dba384d0e95801b404d7b
parent20da60a3b7dae07b39436e88c03c51c5de3f7acc
Merge branch 'MDL-60018-master' of git://github.com/jleyva/moodle