Merge branch 'MDL-51325-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Sep 2015 04:51:30 +0000 (12:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Sep 2015 04:51:30 +0000 (12:51 +0800)

Trivial merge