Merge branch 'MDL-25122' of git://github.com/timhunt/moodle
commit908053e21de88b7f594d7de33945c243794eac77
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Feb 2011 11:41:28 +0000 (22 12:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Feb 2011 11:41:28 +0000 (22 12:41 +0100)
treeb970d23bed410883eaecc8d3bc2efa4112e151c8
parent915a20f5a58d10aefb1497857a769fa5d176ec73
parent79c6e3a0968ee1fedcf8a1f14f8086fcd9dbd3f6
Merge branch 'MDL-25122' of git://github.com/timhunt/moodle