Merge branch 'MDL-52522-master' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Mar 2016 00:35:14 +0000 (08:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Mar 2016 00:35:14 +0000 (08:35 +0800)

Trivial merge