Merge branch 'MDL-50532-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 04:09:30 +0000 (12:09 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 04:09:30 +0000 (12:09 +0800)

Trivial merge