Merge branch 'MDL-61724-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE
commit04cfb8194aeb129b23e5dfb4adb17c4fe012b8d5
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 21:40:17 +0000 (3 23:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 21:40:17 +0000 (3 23:40 +0200)
tree772ea3491fde5f53aabc629d2df1415d7f2c030c
parent623ee07cfe89e0e0007e580293bf82a424bb7c72
parent783eecec419a0f48bfa129548126c786cff9b25a
Merge branch 'MDL-61724-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE