Merge branch 'MDL-61751-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
commit4853023e803f25bba4db4035a52165f859565e3a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 22:24:08 +0000 (4 00:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 22:24:08 +0000 (4 00:24 +0200)
treedf7332d1e1f1813f148d62c96daaec8b33efa6c1
parent61ee905511af9da476a5b45c16f5b2145481e348
parentc7640874bf2ebd8333580e92514fd7126a694cb2
Merge branch 'MDL-61751-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE