Merge branch 'wip-MDL-53026-master' of https://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 16 Mar 2016 02:00:28 +0000 (10:00 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 16 Mar 2016 02:00:28 +0000 (10:00 +0800)
commit4235b98110a85dfeef539bbff64ee2965c61136a
treed2b8bb09743adae7d14843c244de49b3dceaa512
parent3edc162611a74f455e59ebb3357a1cc0af35a740
parent48983fb9e7ef75e92c14cfad54901cbf66deec67
Merge branch 'wip-MDL-53026-master' of https://github.com/marinaglancy/moodle