jetty.project/jetty-annotations
Jan Bartel f22217392b Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
2013-08-08 12:28:51 +10:00
..
src Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-08-08 12:28:51 +10:00
pom.xml Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-08-08 12:28:51 +10:00