Merge remote-tracking branch 'refs/remotes/ivan/feature/support-str-in-charset-detect...
authorTomás Touceda <chiiph@leap.se>
Fri, 17 Jan 2014 18:52:21 +0000 (15:52 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 17 Jan 2014 18:52:21 +0000 (15:52 -0300)

Trivial merge