Merge branch 'MDL-56277-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 18 Oct 2016 08:33:21 +0000 (16:33 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 18 Oct 2016 08:33:21 +0000 (16:33 +0800)
commitb7676ef92c2c0579353598f20eb92275a519b44c
tree05aef869029f4b6c6797a430f19025e4421f8726
parent2017a60e11324791a756c98708b21574a653ca06
parentff274ab0e5287244745abf5ec1f6e742975f10c1
Merge branch 'MDL-56277-master' of git://github.com/FMCorz/moodle