Merge branch 'MDL-57918-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Mar 2017 23:27:19 +0000 (01:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Mar 2017 23:27:19 +0000 (01:27 +0200)
commit5d267581fbf1416978d9be4cd4d95c9fa105f448
tree7c1342de6c15b2e9a72d4ee1be78c7f26f898835
parentd858278a58078c421ad70580f64631a49462936d
parent771effef8d83d157e611386fdfe0ae16ecdaee6e
Merge branch 'MDL-57918-master' of git://github.com/jleyva/moodle