Merge branch 'MDL-54911_m32v3' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Jun 2016 04:32:17 +0000 (12:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 29 Jun 2016 07:05:19 +0000 (15:05 +0800)
commitbe88488274a8c8a79aad05a3c84b3697ef377bb4
tree5066d9336d13f2887828dd695fe8ff40ac0706b5
parent53190b8077ad44a01949c9129cbf28b09846d587
parent443ab2cea98d17271e521a6f45c00d4f45824998
Merge branch 'MDL-54911_m32v3' of https://github.com/sbourget/moodle