Merge branch 'MDL-35148-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Jul 2015 03:06:38 +0000 (11:06 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Jul 2015 03:06:38 +0000 (11:06 +0800)

Trivial merge