Merge branch 'MDL-50083' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 20 Jan 2016 02:02:30 +0000 (10:02 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 20 Jan 2016 02:02:30 +0000 (10:02 +0800)

Trivial merge