Merge branch 'MDL-49871-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 16 Apr 2015 03:22:59 +0000 (11:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 16 Apr 2015 03:22:59 +0000 (11:22 +0800)

Trivial merge