jetty.project/jetty-http2/http2-common
Greg Wilkins e1cc5fb487 Merge remote-tracking branch 'origin/master' into jetty-9.3-ewyk
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java
	jetty-util/src/main/java/org/eclipse/jetty/util/thread/NonBlockingThread.java
2015-01-08 15:21:01 +01:00
..
src Merge remote-tracking branch 'origin/master' into jetty-9.3-ewyk 2015-01-08 15:21:01 +01:00
pom.xml cleaned up OSGi manifest creation 2014-08-15 19:35:49 +10:00