Merge branch 'wip-MDL-31160-m21' of git://github.com/samhemelryk/moodle into MOODLE_2...
commit8837d68be527af11d08b2aded0238dd130d1e748
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 23:54:28 +0000 (1 00:54 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 23:54:28 +0000 (1 00:54 +0100)
tree51f80315372ad865ac37a27ca8c18c9ee9f1da0a
parent5acb97c505dd144f552341252c9262af044c4af7
parentc3b0e64d811dd74dedd6c8c50855cf11ed0b37e0
Merge branch 'wip-MDL-31160-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE