propagate from branch 'i2p.i2p' (head b7ee04ecc7a594239e977b25a52ebdabadce558e)

to branch 'i2p.i2p.zzz.jetty6' (head 2cd4a4dae8b87b9ed2128d83aff1b39e3a818556)
2012-01-08 14:55:10 +00:00
parent 43ec87e412 59bd51a419
commit 69bbb88407
110 changed files with 16328 additions and 6694 deletions
--- a/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java
@ -10,7 +10,7 @@ import org.mortbay.jetty.Server;
 public class LogsHelper extends HelperBase {
    public LogsHelper() {}
    
-    /** @since 0.8.11 */
+    /** @since 0.8.12 */
    public String getJettyVersion() {
        return Server.getVersion();
    }