Merge branch 'MDL-58041_master' of https://github.com/sam-moodle/moodle
commit7002b7c320e37d747fa4816e230954ef50dcd8d8
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Feb 2017 01:29:17 +0000 (28 02:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Feb 2017 01:29:17 +0000 (28 02:29 +0100)
tree2b3055ec655c0145a8ed41e9d78ece7e6de89f81
parentb4472fb4592b883533f1abe22e774ce57af7f0c8
parent29be72373c7d7f5ce0b03d6db116c59c00e4c5d3
Merge branch 'MDL-58041_master' of https://github.com/sam-moodle/moodle