Merge branch 'MDL-56162-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 10 Oct 2016 08:48:07 +0000 (16:48 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 10 Oct 2016 08:48:07 +0000 (16:48 +0800)
commit47e863bb73bf640d139e94513c8276a06ce54b38
treeab853376a587bea8d409ebda5a193504cf58d4c6
parente84c33d694c4dc6ac0014904d78b2496b35c9395
parentd2e09f2b08a290152ad7972ce99274f2a0b869ac
Merge branch 'MDL-56162-master' of git://github.com/FMCorz/moodle