Merge branch 'MDL-52289-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Dec 2015 05:51:14 +0000 (13:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Dec 2015 05:51:14 +0000 (13:51 +0800)

Trivial merge