Fixed merge of development / 12.8.1-5 versions of HttpClient.java

Former-commit-id: 3f88fa9078 [formerly 6dae0398d3 [formerly 34a733bb4701c6f083595be42e5b15cd4ba868bd]]
Former-commit-id: 6dae0398d3
Former-commit-id: 6615c96f33
This commit is contained in:
Steve Harris 2012-08-07 10:04:39 -05:00
parent 1cd1cb250f
commit f19c9fa55d