Merge branch 'MDL-45814-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Nov 2015 06:05:01 +0000 (14:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Nov 2015 06:05:01 +0000 (14:05 +0800)

Trivial merge