Merge branch 'MDL-31058' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 22 Jan 2012 23:56:08 +0000 (00:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 22 Jan 2012 23:56:08 +0000 (00:56 +0100)
commitebf552ca892957a461c54b5ab042879e9af914b1
tree4675f7a864ab63bef210e886b774b3fbaf96af6f
parente0f6a239fc8efbd12a172a07d6ca4db48ddc0973
parentc9b8a56f589a14508b6a0a3876cf323b3c390fc6
Merge branch 'MDL-31058' of git://github.com/timhunt/moodle