Merge branch 'MDL-58462-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Apr 2017 14:35:50 +0000 (16:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Apr 2017 14:35:50 +0000 (16:35 +0200)
commit8478e5b44cd671c9744c4cb42dc9cbfa191981d9
treeaf7aec1ac9bcc5b33c2fc868854c95067b436f51
parent371e2385a98c527db7f1263c32a9951b8717aece
parentcefd780fa3afac7240181df44862366efe4f399c
Merge branch 'MDL-58462-master' of git://github.com/junpataleta/moodle