Merge branch 'MDL-52414_m31v7' of https://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 16 Feb 2016 04:44:09 +0000 (12:44 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 16 Feb 2016 04:44:09 +0000 (12:44 +0800)
commit7fadf9edff57c0b87f3d0f95cc795e23da6feff1
tree40b21af6956fbf3fce603fadbb35cc0183abc87b
parentce74ad69ae81f85975aedd5ed08204901ac9de55
parente6e5d0104fd11dba853b3544503201ba70361b16
Merge branch 'MDL-52414_m31v7' of https://github.com/sbourget/moodle