Merge branch 'MDL-45981-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Oct 2015 00:18:10 +0000 (08:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Oct 2015 00:18:10 +0000 (08:18 +0800)

Trivial merge