Merge branch 'MDL-49409-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Mar 2017 23:25:59 +0000 (01:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Mar 2017 23:25:59 +0000 (01:25 +0200)
commitd858278a58078c421ad70580f64631a49462936d
tree3f8a2f036e9595289d3157232d28c608b3114000
parentd4a8fb899a382112bc29884ed6e0a4ed0317f903
parentef6aea9db8fa5e9ba4710b40b9800a8f31c83226
Merge branch 'MDL-49409-master' of git://github.com/jleyva/moodle