Merge branch 'MDL-57476_file_callbacks' of https://github.com/gthomas2/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Jul 2017 02:31:28 +0000 (10:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Jul 2017 02:31:28 +0000 (10:31 +0800)

Trivial merge