Merge branch 'MDL-31015-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 18:44:21 +0000 (19:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 18:44:21 +0000 (19:44 +0100)
commit008bf7f0aca2265c599e331d9cd75faaf98de953
tree59651aaf5431f0f5cbc6bef467ae4938f58bf7b4
parentba353742ce0fb45da1064212dbbe51417a9bf5e8
parent68828cc4317c9b303c61df8d520c05214305a22c
Merge branch 'MDL-31015-master' of git://github.com/sammarshallou/moodle