jetty.project/jetty-spdy/spdy-client
Greg Wilkins f2f8ec54c6 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	aggregates/jetty-all/pom.xml
	examples/embedded/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java
	examples/embedded/src/main/java/org/eclipse/jetty/embedded/SecuredHelloHandler.java
2013-09-23 13:38:43 +10:00
..
src/main/java/org/eclipse/jetty/spdy/client Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-23 13:38:43 +10:00
pom.xml [maven-release-plugin] prepare for next development iteration 2013-08-15 19:13:27 +10:00