Merge branch 'MDL-53914-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 May 2016 06:16:56 +0000 (14:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 May 2016 06:16:56 +0000 (14:16 +0800)

Trivial merge