Merge branch 'MDL-24064-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 13 Jun 2016 01:17:53 +0000 (09:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 13 Jun 2016 01:17:53 +0000 (09:17 +0800)

Trivial merge