Merge branch 'MDL-55869_m32v1' of https://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 18 Nov 2016 01:16:06 +0000 (09:16 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 18 Nov 2016 01:16:06 +0000 (09:16 +0800)
commitaab30ea8281195a010c08933f83a33988fcf9864
tree5337c7294c1c07e31e619112992b5398ee500352
parent74c21d51d0ce03aaf3386cc192327c5b14303466
parent3a2f9a2ea42c1b35d52647ff7eea27ecef3d8b6b
Merge branch 'MDL-55869_m32v1' of https://github.com/sbourget/moodle