Merge branch 'MDL-51431' of https://github.com/andrewhancox/moodle
commit4b65342dbaf54a9d29f0fa46220eb7bdf8b593d9
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Sep 2015 00:09:38 +0000 (21 08:09 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Sep 2015 00:09:38 +0000 (21 08:09 +0800)
tree47eca88d0919577d035eea24379e22113f43fac5
parentd230899db89b3c1539bdd1be3f3f776cfe3a85f4
parent7fca67ee29fcb7e6ccc7ba8bfe00fab5805e9549
Merge branch 'MDL-51431' of https://github.com/andrewhancox/moodle
enrol/flatfile/lib.php