Merge branch 'MDL-29768-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 16 Oct 2011 15:46:18 +0000 (17:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 16 Oct 2011 15:46:18 +0000 (17:46 +0200)
commitf3c34143f962fb622bb60afadc1fc994849ca29e
tree589ecbb146220ee8f25e96c2bdbff4e19e81d828
parent28a01625f0c8a26b7d40c022aa3c933597b37781
parent2e98ae02ec2af3ab2312e2cc524c70c8d5ba6ad6
Merge branch 'MDL-29768-master' of git://github.com/sammarshallou/moodle