Merge branch 'MDL-53081-master-txtfiles' of git://github.com/mudrd8mz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Feb 2016 03:13:45 +0000 (11:13 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Feb 2016 03:13:45 +0000 (11:13 +0800)

Trivial merge