Merge branch 'MDL-50982-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Sep 2015 03:01:50 +0000 (11:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Sep 2015 03:01:50 +0000 (11:01 +0800)

Trivial merge