Jan Bartel 050cb83b35 Merge remote-tracking branch 'origin/master' into jetty-8 ... Conflicts: jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleWebSocketServlet.java jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterTest.java jetty-websocket/pom.xml		2011-08-12 18:43:15 +10:00
..
src	Merge remote-tracking branch 'origin/master' into jetty-8	2011-08-12 18:43:15 +10:00
pom.xml	reverted version	2011-07-18 09:15:31 +10:00