Merge branch 'MDL-48969_m29v9' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 11:48:44 +0000 (11:48 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 11:48:44 +0000 (11:48 +0000)
commit9569976f8668f1a3b30588ef9640a7653eda275e
treeab4db123d50571ac0e6a57934e84d833e5479f46
parentbd65120bff2b66aaff14103c20fcf13d5dd574c3
parent846f6dc71299036a9b8e4ff8222b04d297152af5
Merge branch 'MDL-48969_m29v9' of https://github.com/sbourget/moodle