Merge branch 'MDL-50829-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:56:31 +0000 (09:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:56:31 +0000 (09:56 +0800)

Trivial merge