Merge branch 'w02_MDL-43537_m27_env' of https://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jan 2014 15:01:27 +0000 (16:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jan 2014 15:01:27 +0000 (16:01 +0100)
commit1b92203ef3582b8b7a6a807c2ef25b94f07c780b
treec3a0aedd5c841a788a31a62a9bf7105e752478a4
parent473924dfd5f0de2b6dd00f3fa7e215940e8a95ec
parent18a336c4e7265b9ef0c47972df74059ed718a5c4
Merge branch 'w02_MDL-43537_m27_env' of https://github.com/skodak/moodle