Merge branch 'MDL-54889-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Jul 2016 01:27:17 +0000 (09:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Jul 2016 01:27:17 +0000 (09:27 +0800)

Trivial merge