Merge branch 'MDL-57814-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Mar 2017 17:00:48 +0000 (18:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Mar 2017 17:00:48 +0000 (18:00 +0100)
commitbeff62f6ecb6dfdb75c71e403c7da980e7a69b92
tree876996dc90412a19a88525fe1e8b88ab52ef2bb7
parent74ccc7768ea8a0c4f703b2ee8a805303d5141a5e
parentb315d721d9173c43c71da64c2d2bec7e8cd4b230
Merge branch 'MDL-57814-master' of git://github.com/jleyva/moodle