Merge branch 'MDL-54965-32' of git://github.com/tobiasreischmann/moodle into MOODLE_3...
commit3b5086345e35199e126d19d246a6ade5756278b8
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Jul 2017 11:41:50 +0000 (11 13:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Jul 2017 11:41:50 +0000 (11 13:41 +0200)
tree911856b2bb8b5b07fdf3334855158e1d96d5678b
parentbb245a5462bfeb18d58426d9e3fb4c166e2191d2
parent038a740720b390ce94edbb1f049031d6c89c5c9e
Merge branch 'MDL-54965-32' of git://github.com/tobiasreischmann/moodle into MOODLE_32_STABLE