Merge branch 'MDL-54074-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 May 2016 03:22:37 +0000 (11:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 May 2016 03:22:37 +0000 (11:22 +0800)

Trivial merge