Merge branch 'MDL-56532-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2016 18:05:03 +0000 (20:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2016 18:05:03 +0000 (20:05 +0200)
commitd6ab5917fa15659cf49634b170a0399b9484f7d7
tree801d638e7d42652071bfe2d821b641ef76665579
parentb5c5d741c481af3f10350cff4497ad48bd12ee30
parentc6698a4f0fbf57cbc201dbed133d67cba0c879ad
Merge branch 'MDL-56532-master' of git://github.com/andrewnicols/moodle
admin/tool/usertours/lang/en/tool_usertours.php