Merge branch 'MDL-58754-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 May 2017 17:32:45 +0000 (19:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 May 2017 17:32:45 +0000 (19:32 +0200)
commitc30bddcfb45eb5f4d3513056ca32e908683a410c
tree4e61b49d660d22512916e026ac3eba79d28bebf2
parent91edf89d86f5df928072f3e48950e5494c9d4c7a
parent458e5f66c215d326478ecea5035a53cacae9d0f8
Merge branch 'MDL-58754-master' of git://github.com/andrewnicols/moodle