Merge remote-tracking branch 'ivan/bug/4427_default-encoding-to-utf8' into develop
authorTomás Touceda <chiiph@leap.se>
Mon, 11 Nov 2013 19:36:26 +0000 (16:36 -0300)
committerTomás Touceda <chiiph@leap.se>
Mon, 11 Nov 2013 19:36:26 +0000 (16:36 -0300)

Trivial merge