Merge branch 'MDL-59243-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 Sep 2017 10:09:52 +0000 (12:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 Sep 2017 10:09:52 +0000 (12:09 +0200)
commitc06e187aaff0ef49d5d3a1cc4cc001e912a001f2
tree5a7d4ccae1b2e50e73a989929ef624cff8917eae
parentcf7430f07ca47ffbdf8a4fbbc65e068e2ecb5b9a
parent4834e127eb3c3b96f4c5be196b872c4c58f913d6
Merge branch 'MDL-59243-master' of git://github.com/jleyva/moodle