Merge branch 'MDL-53010-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Mar 2016 06:34:17 +0000 (14:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Mar 2016 06:34:17 +0000 (14:34 +0800)

Trivial merge