Merge branch 'MDL-56662-master' of git://github.com/damyon/moodle
commit38b74ef7177d020b9090340e21b907c4fb88865e
authorDavid Monllao <davidm@moodle.com>
Wed, 9 Nov 2016 05:58:01 +0000 (9 13:58 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 9 Nov 2016 05:58:01 +0000 (9 13:58 +0800)
treeac55e913fd76cda2100e579f380dadc6c4426fec
parent6e986b2919737ce9931c3f4a515cee96500e5020
parentf87084f8f13d51a0932a2d6a3ecab032378b59f8
Merge branch 'MDL-56662-master' of git://github.com/damyon/moodle