proxy - a possible fix for buggy charset detection
Merge pull request #498 from georchestra/proxy_encoding

proxy - fix for buggy charset detection
Merge branch '13.06' into 13.09
Merge branch '13.09'