Merge branch 'MDL-53027-master' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Mar 2016 02:40:27 +0000 (10:40 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Mar 2016 02:40:27 +0000 (10:40 +0800)

Trivial merge