Merge branch 'MDL-54879-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Aug 2016 01:10:19 +0000 (09:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Aug 2016 01:10:19 +0000 (09:10 +0800)

Trivial merge