Merge branch 'MDL-12689_master-fix' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 6 Apr 2017 09:51:37 +0000 (10:51 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 6 Apr 2017 09:51:37 +0000 (10:51 +0100)
commitb634c3266851c8053bd8515577d8c922525201c4
treed95255f4502c03491e5bb2d1e8b2021120ab4c67
parentc846111951dec71e40530c68992e6273c5695d34
parent6ef63c5920192806513f146874a1db2a1805f291
Merge branch 'MDL-12689_master-fix' of git://github.com/dmonllao/moodle