Merge branch 'MDL-54004_m30v2' of https://github.com/sbourget/moodle into MOODLE_30_S...
commit1a1182740b2c45118702918cf5a59bc268a27895
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 May 2016 03:38:34 +0000 (10 11:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 May 2016 03:38:34 +0000 (10 11:38 +0800)
tree897ea2ebc16be2fbd2a335212750a60bdd2176b9
parenta5573b48627c42e17e92206537e76afdc96e6611
parent9955806518350c663991c871eec0c9334f8d251d
Merge branch 'MDL-54004_m30v2' of https://github.com/sbourget/moodle into MOODLE_30_STABLE