Greg Wilkins e1b12a633b Merge remote-tracking branch 'origin/master' into jetty-8 ... Conflicts: jetty-distribution/pom.xml jetty-osgi/test-jetty-osgi/pom.xml		2012-01-20 13:00:32 +11:00
..
src	Merge remote-tracking branch 'origin/master' into jetty-8	2012-01-20 13:00:32 +11:00
.gitignore	Adding tests for Named Logging	2011-08-24 09:31:28 -07:00
pom.xml	360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6	2011-12-02 17:27:26 +08:00