Jan Bartel c0f5c5a659 Merge remote-tracking branch 'origin/master' into jetty-9.1 ... Conflicts: jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java		2013-09-10 10:18:12 +10:00
..
src	415401 Add initalizeDefaults call to SpringConfigurationProcessor	2013-09-09 18:01:03 +10:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-08-15 19:13:27 +10:00