Merge branch 'MDL-58567-master-v2' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Jun 2017 11:39:47 +0000 (12:39 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Jun 2017 11:39:47 +0000 (12:39 +0100)
commite796817c97204ffac5fab3c525d214b42d5757c7
treedd4ef6a62f5802e65eea475615f817a11cfe2f6f
parent37c9bbe37d5cac60ca7d1a2e810db42dbd7da510
parent03440bcb37ec476eaa6d94bcdfe3a6e58aa1158a
Merge branch 'MDL-58567-master-v2' of https://github.com/sammarshallou/moodle