Merge branch 'MDL-56426_master' of git://github.com/markn86/moodle
commitcead8a81388c1644db892947f4c3eb9fe73a89d5
authorDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 14:03:10 +0000 (14 14:03 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 14:03:10 +0000 (14 14:03 +0000)
tree8d71d718f61a6e4bc1a2867b46e00f5185384962
parent8bcc2cbd8a23856a557e5269307afd2f6776da71
parentf34df17977bebc70dd1b543938aca132ca2701a6
Merge branch 'MDL-56426_master' of git://github.com/markn86/moodle