Merge branch 'MDL-52386-master' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Mar 2016 23:50:10 +0000 (07:50 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Mar 2016 23:50:10 +0000 (07:50 +0800)

Trivial merge