Merge branch 'MDL-59268-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 25 Jul 2017 08:04:59 +0000 (09:04 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Jul 2017 08:04:59 +0000 (09:04 +0100)
commita13277a74032eed40ea9bc9cef5d671e028a13a3
tree19fa6510048eb85abd42b9a118fb858daa631c4b
parent11b31ab85781c15b920d20c1254d4cf8441f99e9
parentcd4950291f539480a844c69a60c59b30ddb9c7e6
Merge branch 'MDL-59268-master' of git://github.com/jleyva/moodle