Merge branch 'MDL-35858-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 12 Oct 2012 00:15:34 +0000 (02:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 12 Oct 2012 00:15:34 +0000 (02:15 +0200)
commit2105f57590ea6d069f0ab43997a41d74ecdb0f62
treeae587df136add602ad80697fcb34bf69e85c59e8
parent28990bbef4bba0c02bdcfd1351ea6a424a1a1797
parent588d1b595a5338c626d42cca0e2e696457c3b8d7
Merge branch 'MDL-35858-master' of git://github.com/FMCorz/moodle