Merge branch 'MDL-54655_m32v1' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 May 2016 05:29:48 +0000 (13:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 May 2016 05:29:48 +0000 (13:29 +0800)
commitb29d2b2aa8500aaa9202ec424c49f888939ec2c8
tree7658af8bfcb87760092f114c5b83a4c887a5d116
parent5751f7a36ce57a196f47d9418df07a5540a04647
parent18875f811a22942c8291ae8fec8de72b5477e770
Merge branch 'MDL-54655_m32v1' of https://github.com/sbourget/moodle