Merge branch 'MDL-56102-master' of https://github.com/xow/moodle
commit14d6945e653e50faabfa0f3f76c1e8d5c64ba34d
authorDan Poltawski <dan@moodle.com>
Wed, 28 Sep 2016 07:16:28 +0000 (28 08:16 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 28 Sep 2016 07:16:28 +0000 (28 08:16 +0100)
treeae1539e660f1fd76bbed2426584229e50870f247
parente1555a7b36d3ea881c893eef34318cf890e7ac02
parent8e55ffc6c314003edd4d24a9f9236817afbde3a6
Merge branch 'MDL-56102-master' of https://github.com/xow/moodle