Merge branch 'MDL-59437-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 13 Jul 2017 08:16:19 +0000 (09:16 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 13 Jul 2017 08:16:19 +0000 (09:16 +0100)
commit671971775fa4a0efb75b61c1dc4a864753c580de
tree42873c542de9cbd53625c85d1318583c9ff6c61e
parentf6a7d54f246cd5d842a3f888e4bbe232cca1d4f8
parentb7386d00343e3bf011a7c30aa0de8168a89821d1
Merge branch 'MDL-59437-master' of git://github.com/damyon/moodle