Merge branch 'MDL-58651' of git://github.com/aolley/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Jul 2017 23:21:13 +0000 (01:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Jul 2017 23:21:13 +0000 (01:21 +0200)
commitacbcffd34253001c03b8f2de4edcfbec92d98a6c
treedc4633866ced6aa38c2299bce5e77c2aedcacb33
parent77c8eb94c349ae8c6200a3fa53f17f867244f961
parent556ceb207145ce5e798696831d787af67350553b
Merge branch 'MDL-58651' of git://github.com/aolley/moodle