Merge branch 'MDL-59442-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Jul 2017 08:16:29 +0000 (09:16 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Jul 2017 08:16:29 +0000 (09:16 +0100)
commit540177523f2a2bab74f21e1e263bf264d080e188
tree264fd759c4295062c418964f4ae4025a3096a3ab
parent9e3b60c95d019b79d2cfe0ca5dc513d358f3471c
parent3a3d8c487bc6a32991d66cb7e237484105d0c3b6
Merge branch 'MDL-59442-master' of git://github.com/lameze/moodle