Merge branch 'MDL-58490-master-fix' of https://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 21 Apr 2017 02:39:41 +0000 (10:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 21 Apr 2017 02:39:41 +0000 (10:39 +0800)
commit7125b4f17c89969aa8ec279c3146438bbe102431
tree92d971ce28974028224eadf671dcaa66445e0aff
parentdd9c469ffcddbfff9ab313feaaf112672fe9e36f
parentc5515a34b594311a9a4ad8ebe7e3a90f90483b30
Merge branch 'MDL-58490-master-fix' of https://github.com/lameze/moodle