Merge branch 'wip-MDL-59881-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE
commit42ae181f6cffa32786aed494cd73c7f6e4dbca25
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Aug 2017 22:59:57 +0000 (25 00:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Aug 2017 22:59:57 +0000 (25 00:59 +0200)
tree85c54f16a7284acb5f11d36f45dff9b0c44d5776
parentaf129014b1943fca6c5aed5971bc838e5b2c43a6
parent3298e737cf55093c0af9191bd4ac2a7dab1d2e7e
Merge branch 'wip-MDL-59881-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE