Merge branch 'MDL-55254_m32v3' of https://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 25 Jul 2016 20:27:48 +0000 (04:27 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 25 Jul 2016 20:27:48 +0000 (04:27 +0800)
commitfa2e488520472b2a29dc90c383f1f3d15daf2d32
tree314bf2c14037c7890616fbd18f5a83351167c28c
parent46ac7b07d488c3a55b6c03c0d3bc94a62298eb43
parent12306a9f0f06b1978f1296cb6cf54a405f96c5e7
Merge branch 'MDL-55254_m32v3' of https://github.com/sbourget/moodle