Jan Bartel 286df12f03 Merge remote-tracking branch 'origin/master' into jetty-8 ... Conflicts: jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java		2012-09-28 19:27:07 +10:00
..
src/main/java/org/eclipse/jetty/security/jaspi	Merge remote-tracking branch 'origin/master' into jetty-8	2012-09-28 19:27:07 +10:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2012-09-10 14:18:11 -05:00