jetty.project/jetty-jmx
Greg Wilkins a642f7b55c Merge remote-tracking branch 'origin/master' into jetty-7.6
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
2011-10-24 11:27:42 +11:00
..
src Merge remote-tracking branch 'origin/master' into jetty-7.6 2011-10-24 11:27:42 +11:00
pom.xml refactored HttpConnection name 2011-10-20 15:12:19 +11:00