Merge branch 'MDL-50295-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Jul 2015 06:02:07 +0000 (14:02 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Jul 2015 06:02:07 +0000 (14:02 +0800)

Trivial merge