Merge branch 'MDL-54795_master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 18:10:33 +0000 (20:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 18:10:33 +0000 (20:10 +0200)
commitefb2517a2fae71a550f2f452c2351e390e0db94a
tree49218e43ba3c9a03bc263f91947d1744903b2013
parent6b43e964acf7b74b93ad2b36d7c4b311e5b9677f
parent9e12b0faf7da726612d96d2c84744b5c526ae816
Merge branch 'MDL-54795_master' of https://github.com/snake/moodle