Merge branch 'MDL-30275-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 20:29:25 +0000 (21:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 20:29:25 +0000 (21:29 +0100)
commit2fee72e19b20f34582090543986f5e4af0a2bc3d
tree53fce71555f18c70af89ed2e575710cff2933bb3
parent63a1625d788745aa7bce67bcb944f968ce0b7082
parent24ad1d1feb8ecf173bf036671644b10691080bae
Merge branch 'MDL-30275-master' of git://github.com/sammarshallou/moodle