propagate from branch 'i2p.i2p' (head 5737078c5993e2fcf73520cc610a71125b12520b)

to branch 'i2p.i2p.zzz.jetty7' (head a93a47d79b1db119ec8c62b46a4a4e226043bd17)
2013-04-07 13:20:34 +00:00
parent 7b753c9d30 18e369bcf4
commit f8d323bc7b
52 changed files with 1940 additions and 600 deletions
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -177,10 +177,11 @@ Applications:
   By welterde.
   See licenses/LICENSE-GPLv2.txt

-   Jetty 6.1.26:
-   Copyright 1995-2009 Mort Bay Consulting Pty Ltd
-   See licenses/LICENSE-Jetty.txt
+   Jetty 7.6.8.v20121106:
+   See licenses/ABOUT-Jetty.html
+   See licenses/NOTICE-Jetty.html
   See licenses/LICENSE-Apache2.0.txt
+   See licenses/LICENSE-ECLIPSE-1.0.html
   See licenses/NOTICE-Commons-Logging.txt

   JRobin 1.5.9.1: