Merge branch 'MDL-61952-33' of git://github.com/sarjona/moodle into MOODLE_33_STABLE
commitb88a6ac832a869b996c01e617d0984de20a6591f
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Apr 2018 02:52:15 +0000 (16 10:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Apr 2018 02:52:15 +0000 (16 10:52 +0800)
tree11ae9d0e5e74205e6cef669fabc73c6c3d114874
parent4ccebf873e02542f503f24a90f616ce3e3d27612
parenta79e82588de9018a932defa88f4dd8837ec0d4ee
Merge branch 'MDL-61952-33' of git://github.com/sarjona/moodle into MOODLE_33_STABLE