Merge branch 'MDL-53982-master' of https://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 May 2016 06:26:50 +0000 (14:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 May 2016 06:26:50 +0000 (14:26 +0800)

Trivial merge