Commit Graph

53 Commits

Author SHA1 Message Date
Jesse McConnell e1c516c7d1 merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06:00
Jan Bartel c9db4ca815 Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-proxy/pom.xml
	pom.xml
2012-11-30 15:45:36 +11:00
Jan Bartel 94c05e6c2e Porting test webapps from codehaus to jetty-9 2012-11-02 15:43:05 +11:00