Merge branch 'MDL-49296_m29v3' of https://github.com/sbourget/moodle
commitf51ef4d102530e2a7c618d54ff06725e6bf20f4d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Mar 2015 11:03:50 +0000 (17 12:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Mar 2015 11:03:50 +0000 (17 12:03 +0100)
treea93977b51db8876de08d94ba6cea58fb28525e3b
parent536cf8c298e6d5d44ba3e2c2034cd816d60c89d5
parentd27e9a2cdb42069b77e6deb0b4c7a86afee8b042
Merge branch 'MDL-49296_m29v3' of https://github.com/sbourget/moodle