Merge branch 'MDL-43594-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Sep 2015 05:49:30 +0000 (13:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Sep 2015 05:49:30 +0000 (13:49 +0800)

Trivial merge