Merge branch 'MDL-60129_master-v2' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Oct 2017 21:17:36 +0000 (23:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Oct 2017 21:17:36 +0000 (23:17 +0200)
commit6d170ad5089fd9ef51ad5865b62ff8a751b6403f
treefd1e8d51bb56b526de404b60d3e4c69534f707e3
parent4c54ac22d34d62b8ec474a284af6a19f80c2407a
parentd8819e4edecc8d6e8e30da9595781e0c2c885c35
Merge branch 'MDL-60129_master-v2' of git://github.com/markn86/moodle