Greg Wilkins 74fd2e8965 Merge branch 'master' into jetty-7.6 ...

Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java

2011-10-19 17:43:55 +11:00

..

src

Merge branch 'master' into jetty-7.6

2011-10-19 17:43:55 +11:00

pom.xml

[maven-release-plugin] prepare for next development iteration

2011-10-11 08:47:07 -05:00