Merge branch 'MDL-59413_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 00:35:26 +0000 (02:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 00:35:26 +0000 (02:35 +0200)
commit39f8a9636e7947cdbf012cd9f9e68ff0ac1a81d7
tree0c3471449fc91ff7129e81969e6cff20c924280d
parent8eb4f41f1df1c71c9a37a51295e95eb96156d5a5
parente727e91c38af156cb8df84954dfc0dc3dc89e783
Merge branch 'MDL-59413_master' of git://github.com/markn86/moodle