Merge branch 'MDL-61947-33' of git://github.com/zig-moodle/moodle into MOODLE_33_STABLE
commit4444333a285e02ea7608d56faf15927cd32eeab5
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Apr 2018 06:52:55 +0000 (26 14:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Apr 2018 06:52:55 +0000 (26 14:52 +0800)
treede2a1ac13c5257ea5b7868e5a144154760332ed5
parenteb960618a167d5697780dd15836b8a134bc98530
parent05807656a2ae82e8aab6684c811aa953f642f634
Merge branch 'MDL-61947-33' of git://github.com/zig-moodle/moodle into MOODLE_33_STABLE