Merge branch 'MDL-60060-master' of git://github.com/lameze/moodle
commit5258525f0abed93822b0a1bbab924b167a530f9a
authorDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 06:08:08 +0000 (11 14:08 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 06:08:08 +0000 (11 14:08 +0800)
treeaddfe435ed4c651b6f01b2cc31064336495879f7
parentfe955c5645458df2e7a6692cc3c398b700f7acb5
parent61ac58a8874519c6e0cf068122913ede1c56c1c2
Merge branch 'MDL-60060-master' of git://github.com/lameze/moodle