Merge branch 'MDL-52570-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jan 2016 01:49:22 +0000 (09:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jan 2016 01:49:22 +0000 (09:49 +0800)
commite2789e6bc178db4f0f01dc2551d1805342c1fbe8
tree4b33ac583dae72f031eda85c195ab395f71ec2d3
parent324a43c51ecd7ca261b5ae92a37c5fa895998be7
parentea21d6370f17585f8abe0e5cc5af0c8e68044c47
Merge branch 'MDL-52570-master' of git://github.com/jleyva/moodle