Merge branch 'MDL-51162-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Oct 2015 02:48:14 +0000 (10:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Oct 2015 02:48:14 +0000 (10:48 +0800)

Trivial merge