Merge branch 'MDL-57250_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Dec 2016 10:25:07 +0000 (10:25 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Dec 2016 10:25:07 +0000 (10:25 +0000)
commit2956ca50fa58e482236c56804076bf8e311cbf8b
treef7977661033cf8ca0101b112c0b7938210d366fa
parentba78bd4f56ba78baed3129861675bb0d0449bf75
parentf04dda1071c97e7db5d93f9bb1c67096598d5c07
Merge branch 'MDL-57250_master' of git://github.com/markn86/moodle