Merge branch 'MDL-60806-master' of git://github.com/lameze/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 20 Nov 2017 07:23:42 +0000 (15:23 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 20 Nov 2017 07:23:42 +0000 (15:23 +0800)
commite5902279220cee0ed02fc2a12f7aa38f5ea65735
tree83e7c58781210ddb76c8bda05379a19779dbdd46
parent8ee2d9c3d412b7cc4257ee5fc17782d94957a11e
parent5e8e87aaee2d8f003b4b95fe555ca6b40ab214dd
Merge branch 'MDL-60806-master' of git://github.com/lameze/moodle