Merge branch 'MDL-59395_master-fix2' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Jul 2017 13:34:43 +0000 (15:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Jul 2017 13:34:43 +0000 (15:34 +0200)
commitda120d408ceb78fb893907506b3c0ed2a7e67a4d
tree2658d571ad7d6ba352f2456d0a2c593d1f31de3a
parentb9e9ff88308612b095da6b0b8ef9b46579c9de94
parenta6a65da4f3c00abdb199a489b1738dcd2f11440b
Merge branch 'MDL-59395_master-fix2' of git://github.com/markn86/moodle