Merge branch 'MDL-46878-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Sep 2015 04:05:32 +0000 (12:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Sep 2015 04:05:32 +0000 (12:05 +0800)

Trivial merge