Greg Wilkins b3e1114313 Merge remote-tracking branch 'origin/jetty-8' ... Conflicts: VERSION.txt jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleTrackerCustomizer.java jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java		2012-11-30 12:04:00 +11:00
..
src	Merge remote-tracking branch 'origin/jetty-8'	2012-11-30 12:04:00 +11:00
pom.xml	jetty-9 cleaning up dependencies	2012-11-23 16:25:57 +11:00