Merge branch 'MDL-29738-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 15:05:28 +0000 (17:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 15:05:28 +0000 (17:05 +0200)
commit46da6e14ec28115e9fe6a604bcfeee4a55663c29
tree784fc3d9768b29a3bd477921500bbf4a7b28fc37
parenteb3b4893b535567641afabee80649c2bf052f374
parentff3778bf97b60d1a6852447a103e359203f36c1a
Merge branch 'MDL-29738-master' of git://github.com/andrewnicols/moodle