Merge branch 'MDL-59395_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 10:00:12 +0000 (12:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 10:00:12 +0000 (12:00 +0200)
commit92acc71388b606f67a10c79eee4aa8e6a0436a56
treed97f5008b755ad51f805b5790208f821e7f71b9c
parentaef0609316569a73aa8f13a46791e58fc15b10dc
parentba6645daa08d948a94a7cef5e0dd1a2347cef9d6
Merge branch 'MDL-59395_master' of git://github.com/markn86/moodle