Merge branch 'wip-MDL-56614-fix' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Dec 2016 06:56:49 +0000 (14:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Dec 2016 06:56:49 +0000 (14:56 +0800)
commit86f4236cc250b087df80522cff69fcdc28a0f567
treedfa196672e835169df9e0ed1418f76b65bb2f916
parent4b2bcd2376e1cbdcade1e9ec18bab660d33c5c98
parentc0ad000f462abec5d0b30b3eec49715086af0923
Merge branch 'wip-MDL-56614-fix' of https://github.com/marinaglancy/moodle