jetty.project/jetty-server
Jan Bartel 93cc111a02 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java
2011-07-25 17:42:30 +10:00
..
src Merge remote-tracking branch 'origin/master' into jetty-8 2011-07-25 17:42:30 +10:00
pom.xml reverted version 2011-07-18 09:15:31 +10:00