Merge branch 'MDL-51710-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:12:18 +0000 (09:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:12:18 +0000 (09:12 +0800)

Trivial merge