Merge branch 'MDL-60357-m32' of https://github.com/sammarshallou/moodle into MOODLE_3...
commit6b0bf399e2a91597df21e7b4baf851e5c938e229
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Oct 2017 18:50:11 +0000 (11 20:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Oct 2017 18:50:11 +0000 (11 20:50 +0200)
tree953085970344ec8d0ca7ffb7375a162ef5abb88b
parentfb00e2dc97f5f750709f4449faed12b9e4779f4f
parent68049f376fa8f6b0237ffd940b751c095c349569
Merge branch 'MDL-60357-m32' of https://github.com/sammarshallou/moodle into MOODLE_32_STABLE