Jan Bartel 6a48749f0c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 ... Conflicts: jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java		2013-02-22 11:32:57 +11:00
..
src	Merge remote-tracking branch 'origin/jetty-7' into jetty-8	2013-02-22 11:32:57 +11:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-01-31 11:34:38 -06:00