Jan Bartel 02a66a00fb Merge remote-tracking branch 'origin/master' into jetty-8 ... Conflicts: VERSION.txt jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/WebEquinoxToolsActivator.java pom.xml		2011-08-01 14:39:39 +10:00
..
main/java/org/eclipse/jetty/websocket	353073 test harness for websocket client and improved ietf draft 10 compliance	2011-08-01 12:35:01 +10:00
test	Merge remote-tracking branch 'origin/master' into jetty-8	2011-08-01 14:39:39 +10:00