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)
commita30167510155dc1202649efefac607bff01dda40
tree11a4ecb92a2462af78e562a8917c6b43300befdf
parent1cf840074b269ee730c554d405cd895c979b1425
parent03f0cd1039f43dad9a4124c397e5e22f608f5ad0
Merge branch 'w23_MDL-33007_m23_buggyiconv' of git://github.com/skodak/moodle