Merge branch 'MDL57475-master' of https://github.com/mmafrar/moodle
commitc94e64fad15d5ea26db85daad57fce052114c918
authorDavid Monllao <david.monllao@gmail.com>
Wed, 12 Apr 2017 14:18:53 +0000 (12 16:18 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 12 Apr 2017 14:18:53 +0000 (12 16:18 +0200)
tree9626307adc2c1710a6ab42cc10c11f9924b9aa56
parent10a6361e1c9a62d6ec681fe585ab15509d1fc06c
parent49b60a1c9a3a8c1ef3d500b796881c9a1deb2a65
Merge branch 'MDL57475-master' of https://github.com/mmafrar/moodle