jetty.project/jetty-ajp/src
Greg Wilkins 55d5020980 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2011-11-29 09:06:25 +11:00
..
main Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-29 09:06:25 +11:00
test/java/org/eclipse/jetty/ajp organised imports 2011-10-18 15:05:22 +11:00