Merge branch 'MDL-53019' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Jul 2016 00:15:02 +0000 (08:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Jul 2016 00:15:02 +0000 (08:15 +0800)

Trivial merge