Merge branch 'MDL-51685-master' of git://github.com/dpalou/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Nov 2015 02:41:43 +0000 (10:41 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Nov 2015 02:41:43 +0000 (10:41 +0800)
commitf8e685af440ddb3c75fc9916320de0a0aa010a83
tree409b5bf544345f2c377c50df26b1547dd1dafaa0
parent03b1f63d40d09c206f641b246110c2371d3068a2
parent1f7273af6ad84f500ed200c12296f0534d7c52fb
Merge branch 'MDL-51685-master' of git://github.com/dpalou/moodle