Merge branch 'w03_MDL-31142_m23_slowiconv' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2012 00:36:03 +0000 (01:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2012 00:36:03 +0000 (01:36 +0100)
commit4374d0315814ce99da0c965606a5e50bee457629
tree1354cc10b04f6236d6552d39ddf4f0c1bddf2e96
parentf58e09cbce286aa4589bb47d7de90fc0d3366eda
parentca281c51bb945675ff2d8066803234d63561bbc5
Merge branch 'w03_MDL-31142_m23_slowiconv' of git://github.com/skodak/moodle