Merge branch 'MDL-55575_B' of https://github.com/bostelm/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 19 Dec 2016 13:59:13 +0000 (14:59 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 19 Dec 2016 13:59:13 +0000 (14:59 +0100)
commite3578224ccb159539e8668904576c844fe18099b
treefdee90fba3abbbdd158fa65f7b5b5c1816398d07
parent902b32bd1b37629cb632b5b13222fab40682140b
parenta2a1a586831d1172e835ee8b3830a6e7f1dea0f6
Merge branch 'MDL-55575_B' of https://github.com/bostelm/moodle