jetty.project/jetty-server
Joakim Erdfelt 29d63b41b1 Merge branch 'jetty-9.2.x' into jetty-9.3.x
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorHttpServerTest.java
2015-10-13 08:39:45 -07:00
..
src Merge branch 'jetty-9.2.x' into jetty-9.3.x 2015-10-13 08:39:45 -07:00
pom.xml Updating to 9.3.5-SNAPSHOT 2015-10-08 17:49:09 -07:00