Merge branch 'MDL-55663-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Sep 2016 16:06:40 +0000 (18:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Sep 2016 16:06:40 +0000 (18:06 +0200)
commitf30c075d69d8aaf49eecf1001a27d499a75c5929
treede32bbbacf1be13c489e8041b92dd442791f8253
parenta1a564c84a5520831f6f54b212e29efdfec2b4b7
parente5e2f39ed5a0a23bfd2aee59d3e91cd57cfa512f
Merge branch 'MDL-55663-master' of git://github.com/FMCorz/moodle