Merge branch 'MDL-54652-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 03:26:42 +0000 (11:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 03:26:42 +0000 (11:26 +0800)

Trivial merge