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)

Trivial merge