Merge branch 'MDL-60433-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 Oct 2017 12:23:35 +0000 (13:23 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 Oct 2017 12:23:35 +0000 (13:23 +0100)
commit6065875eacab67c16ab221301e624fd851af5a2e
tree8cb49382e04b28579827f4c03836f8bd24a3c2d0
parent3fdecc2841f227c5077f323829ee911cc94e17e7
parent21824a93259fe633eefe776dffcbb0ed81a6b967
Merge branch 'MDL-60433-master' of git://github.com/jleyva/moodle