Merge branch 'MDL-55499-master' of git://github.com/andrewnicols/moodle
commitfc96fac29e984f7d97bdacc413d6a4c467abd930
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Apr 2017 16:23:02 +0000 (4 18:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Apr 2017 16:23:02 +0000 (4 18:23 +0200)
treee5593273ecc9ec053b96862309f64e523cdfcdb5
parent6ebb0947f0dec753420c91056a7f3ed8e70a6ebd
parent9a8753de734628c6cd870099a97673927e0c8c55
Merge branch 'MDL-55499-master' of git://github.com/andrewnicols/moodle