Merge branch 'MDL-43140_master' of https://github.com/markn86/moodle
commite3febb23159dd67900497b4d4f4b545dc2e1a81b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 22:24:22 +0000 (3 23:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 22:24:22 +0000 (3 23:24 +0100)
treeeae132bc68bb3a52d1854ce144f62fdaaf6c3156
parent12f46583f00be0291a45b46ac9a42ffb90bb1e20
parent67bfaaf0dd8a7bb9c1dc11eb9aeafb091d1e34e8
Merge branch 'MDL-43140_master' of https://github.com/markn86/moodle