Merge branch 'MDL-57156-master' of https://github.com/snake/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 28 Nov 2016 06:00:50 +0000 (14:00 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 28 Nov 2016 06:00:50 +0000 (14:00 +0800)
commitc811356efb8236b34258afcc7aa23ef19f3bd6e2
tree68d511c44e2c2f684425d4282adfbb92d56180e6
parentf59bab60c022955ae76a6bb9caa6777284d46208
parent0395ec28e23522adec3d50a783399e54189e516c
Merge branch 'MDL-57156-master' of https://github.com/snake/moodle