Merge branch 'MDL-59921-master' of git://github.com/lameze/moodle
commite34196d6efc054bc34078fc7262690c88e37a544
authorJun Pataleta <jun@moodle.com>
Tue, 10 Oct 2017 05:30:34 +0000 (10 13:30 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 10 Oct 2017 05:30:34 +0000 (10 13:30 +0800)
tree39f06f12966baf754c3cac26ed8f3dfa7d3d996a
parent93effd739f4bca2e4bad74b414bfc4f5673276a5
parent86244e9102ae195fd8fd535fdb997d7f34144fa4
Merge branch 'MDL-59921-master' of git://github.com/lameze/moodle