Jan Bartel e30c05cc2b Merge remote-tracking branch 'origin/jetty-9.2.x' ... Conflicts: tests/test-integration/src/test/java/org/eclipse/jetty/test/support/TestableJettyServer.java tests/test-integration/src/test/resources/BIOHttp.xml tests/test-integration/src/test/resources/BIOHttps.xml tests/test-integration/src/test/resources/NIOHttp.xml tests/test-integration/src/test/resources/NIOHttps.xml		2015-04-30 10:44:44 +10:00
..
src	Merge remote-tracking branch 'origin/jetty-9.2.x'	2015-04-30 10:44:44 +10:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2015-03-25 09:08:27 -05:00