Merge branch 'MDL-60130_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Oct 2017 21:47:07 +0000 (23:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Oct 2017 21:47:07 +0000 (23:47 +0200)
commitbbc8116c530bdd5994710c967fde90dd72712485
tree57a531356c73e3959044e77c9e1e78fe9f59b503
parent1258a59126e15f59daf6554754b603e30b4ce719
parent866939c3cc15a6c678e75a1fe2eb9986f4506a8c
Merge branch 'MDL-60130_master' of git://github.com/markn86/moodle