Greg Wilkins d660cfcff6 Merge remote-tracking branch 'origin/master' into servlet-3.1-api ... Conflicts: jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationBase.java		2013-06-11 11:17:04 +10:00
..
src	410246 - HttpClient with proxy does not tunnel HTTPS requests.	2013-06-08 00:38:11 +02:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-05-06 18:13:04 -05:00