Merge branch 'MDL-60611-master-fix' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 6 Nov 2017 22:31:45 +0000 (11:31 +1300)
committerJun Pataleta <jun@moodle.com>
Mon, 6 Nov 2017 22:31:45 +0000 (11:31 +1300)
commit589b602be300271c463d63919cf0a97b9505302b
tree14961ce634bee9c1ecd9ba00fdd68743d57d4415
parenta56833d49d839c745d336ccca8926c171ee2cc86
parent80011997669a52d949af985fdaa19db01d38ebeb
Merge branch 'MDL-60611-master-fix' of git://github.com/junpataleta/moodle