Merge branch 'MDL-56753-master' of git://github.com/lameze/moodle
commitaf49935a534be73f3458ae3f27d13092d420275c
authorDavid Monllao <davidm@moodle.com>
Thu, 10 Nov 2016 03:38:24 +0000 (10 11:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 Nov 2016 03:38:24 +0000 (10 11:38 +0800)
tree367e5239307bf4825423bef116f61e7c66a13b72
parent96eba6b982f88b7159690906d747c948bba0dc93
parent763f7b05ae769b2023bd116732e67735f2f52756
Merge branch 'MDL-56753-master' of git://github.com/lameze/moodle