Greg Wilkins cc40282a7d Merge remote-tracking branch 'origin/jetty-9.2.x' ... Conflicts: jetty-osgi/jetty-osgi-alpn/pom.xml pom.xml		2015-05-22 21:06:03 +10:00
..
pom.xml	Merge remote-tracking branch 'origin/jetty-9.2.x'	2015-05-22 21:06:03 +10:00