Merge branch 'wip-MDL-29086-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle...
commit4b3d540f21437dda2e5be5c20cc475956d708379
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Mar 2012 01:32:31 +0000 (8 02:32 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Mar 2012 01:32:31 +0000 (8 02:32 +0100)
treefb3a367d33319f1b451fbdd75570c8f36804d374
parent8cd16e9d7190ac182921f33004ed572ca5f5ee2f
parentf123887e94f59a2a13ab58cc5e067bf6572228ab
Merge branch 'wip-MDL-29086-MOODLE_21_STABLE' of git://github.com/abgreeve/moodle into MOODLE_21_STABLE