Merge branch 'MDL-51290-master' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Sep 2015 05:05:30 +0000 (13:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Sep 2015 05:05:30 +0000 (13:05 +0800)

Trivial merge