merge of 'a0b025f180c1f7befcc1eb504c24140cf9e3fc0f'

LICENSE.txt

apps/jetty/apache-tomcat-deployer/NOTICE

apps/jetty/apache-tomcat-deployer/README-i2p.txt

apps/jetty/apache-tomcat-deployer/lib/el-api.jar

apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar

apps/jetty/apache-tomcat-deployer/lib/jasper.jar

apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar

apps/jetty/apache-tomcat/README-i2p.txt

apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar

apps/jetty/build.xml

apps/jetty/java/src/net/i2p/jetty/JettyStart.java

...routerconsole/java/src/net/i2p/router/web/HomeHelper.java

...nsole/java/src/net/i2p/router/web/SummaryBarRenderer.java

core/java/src/net/i2p/client/impl/I2PSessionImpl.java

core/java/src/net/i2p/util/PortMapper.java

history.txt

router/java/src/net/i2p/router/RouterVersion.java

...va/src/net/i2p/router/transport/FIFOBandwidthLimiter.java

router/java/src/net/i2p/router/transport/UPnP.java