Merge branch 'MDL-51245' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Sep 2015 01:24:00 +0000 (09:24 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Sep 2015 01:24:00 +0000 (09:24 +0800)

Trivial merge