Merge branch 'MDL-49231-master-fix2' of https://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 Jan 2016 04:05:34 +0000 (12:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 Jan 2016 04:05:34 +0000 (12:05 +0800)

Trivial merge