Merge branch 'MDL-49802-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 7 May 2015 02:03:37 +0000 (10:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 7 May 2015 02:03:37 +0000 (10:03 +0800)

Trivial merge