Merge branch 'MDL-50771' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 02:19:04 +0000 (10:19 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 02:19:04 +0000 (10:19 +0800)

Trivial merge