Merge branch 'MDL-60675-master' of git://github.com/mihailges/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 13 Nov 2017 06:11:50 +0000 (14:11 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 13 Nov 2017 06:11:50 +0000 (14:11 +0800)
commitfee3033bc714f315a40f8f13d27245d282259330
tree1d624e4511c5a93f02ee151f24c15bfb46dfddae
parente105a752c0543bcc29ea0938a827418a7add96db
parentae4522ff552010ffd3d18117ac1772888d5d51e8
Merge branch 'MDL-60675-master' of git://github.com/mihailges/moodle