Merge branch 'MDL-52250-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Dec 2015 07:13:38 +0000 (15:13 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Dec 2015 07:13:38 +0000 (15:13 +0800)

Trivial merge