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)
commitb17dee1c1ef4f423de4ff56c90e9c6d6b39e2504
tree9c9c97be243360f29347ee9013604de21c5b8e85
parent646dd2fd5fb3980f08490dcba03948164ab62bdf
parent3117dd17ebbce9dcf31ecb2951ba58ed67bcf7ce
Merge remote-tracking branch 'refs/remotes/ivan/feature/support-str-in-charset-detection' into develop