Merge branch 'MDL-56794-master' of git://github.com/damyon/moodle
commit2dcb3746b002fd6d4e627edf6b0b12173287a7a8
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Nov 2016 11:13:18 +0000 (14 12:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Nov 2016 11:28:29 +0000 (14 12:28 +0100)
tree6ded9a1203f52ffe1eca8ce338145ad807d2bf5e
parent4af34676f787343a03f4298a98467dd0724a7e57
parent7d41ccf0fbc084df0daad2f7fc06aef8aafe0eeb
Merge branch 'MDL-56794-master' of git://github.com/damyon/moodle