Merge branch 'MDL-56882-master' of git://github.com/crazyserver/moodle
commit95bfa525493bc56d647067e6e916b376afe89e66
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Nov 2016 10:14:37 +0000 (14 11:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Nov 2016 10:14:37 +0000 (14 11:14 +0100)
tree369abf9a41aa1b102409683cb1fbfbb5a1f87c7e
parentea70612b00646a7e02d9ab1fcf6e3365818987f6
parent0ffe8d2f0c642aa4c94cc27451cd649dca2b5d98
Merge branch 'MDL-56882-master' of git://github.com/crazyserver/moodle