Merge branch 'MDL-59784-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE
commit4d5d8cd0909072169a046018cbe3f2885d64d984
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Aug 2017 10:29:01 +0000 (22 12:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Aug 2017 10:29:01 +0000 (22 12:29 +0200)
tree95cf86953e03684a0faf62ad447318c1af35d301
parent1862ff1afb25493cf11ac6968fee6e7fdbca81bb
parentbe115c10973711aa44a0c471359556747e46bbcc
Merge branch 'MDL-59784-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE