Merge branch 'MDL-51828-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Mar 2016 02:03:12 +0000 (10:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Mar 2016 02:03:12 +0000 (10:03 +0800)

Trivial merge