Merge branch 'MDL-56555-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Nov 2016 17:56:12 +0000 (17:56 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Nov 2016 17:56:12 +0000 (17:56 +0000)
commit231e2ec99a492d670b0244aa78c1319b32c4ef1f
treed53faab47ae80eb282480677f38402b7a04a8ebd
parente20c8ddc80d6db70f6b7c0e183b71ce135d3530f
parent592c691c8f506cae3776dc833f241a7e3b2e2883
Merge branch 'MDL-56555-master' of git://github.com/andrewnicols/moodle