Merge pull request #1 from liangrockman/master

none
Merge pull request #3 from liangrockman/master

Merge Test 2
none
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/apache/http/examples/client/ClientConnectionRelease.java
none
Merge branch 'master' of https://github.com/liangrockman/SensitiveInfoFilter into liangrockman-master

Conflicts:
	src/main/java/org/apache/http/examples/client/ClientConnectionRelease.java
Merge pull request #4 from liangrockman/master

Merge Test 4
Merge branch 'master' of https://github.com/liangrockman/SensitiveInfoFilter into liangrockman-master

Conflicts:
	src/main/java/org/apache/http/examples/client/ClientConnectionRelease.java
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/liangrockman/SensitiveInfoFilter into liangrockman-master

Conflicts:
	src/main/java/org/apache/http/examples/client/ClientConnectionRelease.java
none
Merge pull request #3 from guantaozhou/master

8 - 9 update
Merge pull request #6 from liangrockman/master

Merge guantao's code
Merge pull request #4 from liangrockman2/master

Merge Test 7
Merge branch 'master' of https://github.com/liangrockman/SensitiveInfoFilter into liangrockman-master

Conflicts:
	src/main/java/org/apache/http/examples/client/ClientConnectionRelease.java
Merge branch 'master' of https://github.com/liangrockman/SensitiveInfoFilter into liangrockman-master

Conflicts:
	src/main/java/org/apache/http/examples/client/ClientConnectionRelease.java
Merge pull request #5 from guantaozhou/master

 8 - 9 night
Merge pull request #7 from liangrockman/master

Merge guantao's code
Merge branch 'master' of https://github.com/liangrockman/SensitiveInfoFilter into liangrockman-master

Conflicts:
	src/main/java/org/apache/http/examples/client/ClientConnectionRelease.java
Merge branch 'master' of https://github.com/liangrockman/SensitiveInfoFilter into liangrockman-master

Conflicts:
	src/main/java/org/apache/http/examples/client/ClientConnectionRelease.java