Merge branch 'MDL-55274-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 9 Aug 2016 01:05:09 +0000 (09:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 9 Aug 2016 01:05:09 +0000 (09:05 +0800)

Trivial merge