Change-Id: Idda65263bb026438503078d8191816a38311b2a8
Merge branch 'master' of https://github.com/hijakke/proxy.git

Conflicts:
	src/main/java/snoop/HttpSnoopClient.java
	src/main/java/snoop/HttpSnoopClientHandler2.java
	src/main/java/snoop/HttpSnoopClientInitializer.java
Change-Id: Idba2171b11c24d3e7f77c96433eeecb87eaed74c