Merge branch 'MDL-51302-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Oct 2015 03:33:23 +0000 (11:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Oct 2015 03:33:23 +0000 (11:33 +0800)

Trivial merge