Merge branch 'MDL-51629-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 16 Oct 2015 02:56:19 +0000 (10:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 16 Oct 2015 02:56:19 +0000 (10:56 +0800)

Trivial merge