Merge branch 'MDL-50162-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 8 May 2015 05:56:11 +0000 (13:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 8 May 2015 05:56:11 +0000 (13:56 +0800)

Trivial merge