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

Trivial merge