Greg Wilkins 4e4ffaa54c Merge remote-tracking branch 'origin/master' into servlet-3.1-api ... Conflicts: jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java		2013-06-17 16:29:39 +10:00
..
src/main/java/org/eclipse/jetty/osgi/boot	Fix errors from small osgi refactor; comment out some test code	2013-05-28 15:10:12 +10:00
build.properties	updated to patch from 20091210	2009-12-11 03:27:18 +00:00
pom.xml	Merge remote-tracking branch 'origin/master' into servlet-3.1-api	2013-06-17 16:29:39 +10:00