Merge branch 'MDL-61975-34' of git://github.com/zig-moodle/moodle into MOODLE_34_STABLE
commit1de7010e47dac55fa62b322c9e5f511bfbe7e1cb
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 00:17:42 +0000 (20 02:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 00:17:42 +0000 (20 02:17 +0200)
tree4d1d3f3fb7498fe66c50c1a90f4478fa8f64730f
parent7bf7bee56cdeb4068906a927858a08fe56d3929d
parent0e16e180df8d0b80390dcce6e331b06bc72d7982
Merge branch 'MDL-61975-34' of git://github.com/zig-moodle/moodle into MOODLE_34_STABLE