Merge branch 'MDL-57409-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2017 19:52:04 +0000 (20:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2017 19:52:04 +0000 (20:52 +0100)
commita7068a85bf69861086fe0a166963c6820ee01227
treefa5f3adcb4b4fd81261b63264e64a74a8a65ba08
parent4a237e932a57285cf6d863336313292f1a6062c6
parent7bdcf970bc922f288278638bb28f608a3ce141b0
Merge branch 'MDL-57409-master' of git://github.com/jleyva/moodle