Merge branch 'MDL-60300-m33' of https://github.com/NeillM/moodle into MOODLE_33_STABLE
commit795c5635e03d4f87436eb09a0205474712eaf0b6
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Oct 2017 23:40:04 +0000 (11 01:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Oct 2017 23:40:04 +0000 (11 01:40 +0200)
tree979b4644f64615af9346ad175c1a3103f6706c6e
parent91bc1d09837d735bc8a36867dd0620835a3bf175
parent6bc6c40f5bde35e9cdf820b6f3891ddbf6b73db8
Merge branch 'MDL-60300-m33' of https://github.com/NeillM/moodle into MOODLE_33_STABLE