Merge branch 'MDL-59285-master' of git://github.com/lameze/moodle
authorDavid Monllao <david.monllao@gmail.com>
Wed, 28 Jun 2017 13:22:10 +0000 (15:22 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 28 Jun 2017 16:24:48 +0000 (18:24 +0200)
commit7f382c05b027112f9711461f9e498732a4805e79
tree21dfcaaeafe98da69aaf0768309b063d75707473
parent1bff0a1d97b171a241e7498f62247954664575ab
parent83f50acd53af0e712f2171540b078515a9ba7a2d
Merge branch 'MDL-59285-master' of git://github.com/lameze/moodle