Merge branch 'MDL-52334' of git://github.com/aolley/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Dec 2015 00:45:30 +0000 (08:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Dec 2015 00:45:30 +0000 (08:45 +0800)

Trivial merge