Merge branch 'mdl57668-master' of https://github.com/tlock/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 12:05:32 +0000 (12:05 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 12:05:32 +0000 (12:05 +0000)
commitd602810fd547bcae9fecd871416d5b07d4f97fba
tree466a6402411e90bf3985f9ec60f6d8209e368302
parent81b3aefc3107afecf3d0ed2d70583751c0215384
parent32a7986422e09ef653c7efd6aa461edbd30c2605
Merge branch 'mdl57668-master' of https://github.com/tlock/moodle