Merge remote-tracking branch 'refs/remotes/ivan/feature/add-non-ascii-and-charset...
authorTomás Touceda <chiiph@leap.se>
Fri, 24 Jan 2014 17:32:15 +0000 (14:32 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 24 Jan 2014 17:32:15 +0000 (14:32 -0300)

Trivial merge