Merge branch 'MDL-56715-master' of https://github.com/xow/moodle
commit096a418d01dfb71bb2143a94bc701e8f838bb647
authorDavid Monllao <davidm@moodle.com>
Thu, 10 Nov 2016 05:19:01 +0000 (10 13:19 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 Nov 2016 05:19:01 +0000 (10 13:19 +0800)
treef42eeaf23460cb9005646ac5e1907cdc315c5b32
parent3302e8bfa501fd67b3e1b7b8ef3fa08e4c389dd0
parenteea9f10900c81e61d2d02d669dccf4d780247a84
Merge branch 'MDL-56715-master' of https://github.com/xow/moodle