Merge branch 'MDL-56214-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 18 Oct 2016 07:02:41 +0000 (15:02 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 18 Oct 2016 07:02:41 +0000 (15:02 +0800)
commit51607c7ea307aebaaea04c567f5701dde224bcd3
tree6c136abd858d24314e310a1fe9f2dedcf38655ce
parent36259a1cc3899d82fb2d4e3a43551f96db44ddf0
parent63ff4f27daa94591c27baeb6f059e46983ad63f3
Merge branch 'MDL-56214-master' of git://github.com/FMCorz/moodle