Merge branch 'w23_MDL-33007_m23_buggyiconv' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Jun 2012 09:33:47 +0000 (11:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Jun 2012 09:33:47 +0000 (11:33 +0200)

Trivial merge