Merge branch 'MDL-54909-master' of git://github.com/crazyserver/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Jun 2016 07:21:19 +0000 (15:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 29 Jun 2016 07:05:23 +0000 (15:05 +0800)

Trivial merge