Merge branch 'MDL-55566_m32v1' of https://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 18 Nov 2016 01:05:13 +0000 (09:05 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 18 Nov 2016 01:05:13 +0000 (09:05 +0800)
commit74c21d51d0ce03aaf3386cc192327c5b14303466
tree4a2233a1e21836a1e1e975c622343c3075a1f527
parent8a668f75a8f7133eb69d47aa6945594c1e5f5786
parent3bf46ee7172d3cacf103dd0f7997f83c452d286b
Merge branch 'MDL-55566_m32v1' of https://github.com/sbourget/moodle