Greg Wilkins 1159111c52 Merge remote-tracking branch 'origin/jetty-9.2.x' ... Conflicts: jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java		2014-11-27 13:34:45 +11:00
..
src/main	452261 - Multiple servlets map to path *.jsp when using jsp-property-group	2014-11-26 15:36:36 +11:00
pom.xml	Merge remote-tracking branch 'origin/jetty-9.2.x'	2014-11-27 13:34:45 +11:00