Merge branch 'MDL-53019' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jul 2016 01:07:39 +0000 (09:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jul 2016 01:07:39 +0000 (09:07 +0800)

Trivial merge