Merge branch 'MDL-54894-master' of git://github.com/crazyserver/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 04:09:09 +0000 (12:09 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 04:09:09 +0000 (12:09 +0800)

Trivial merge