Merge branch 'MDL-51629-master' of git://github.com/jleyva/moodle
commit5762c92fcf2ebb9f2ef33ee3f82a7421f7a09450
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 16 Oct 2015 02:56:19 +0000 (16 10:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 16 Oct 2015 02:56:19 +0000 (16 10:56 +0800)
tree6fb3ddad61ac7d0e24362bc464230cbf91f984d4
parent62029ba7f4b5b25e3d3397c01b834ae0801d6731
parent55dca60f459f158b41d719888732602ae5287755
Merge branch 'MDL-51629-master' of git://github.com/jleyva/moodle