propagate from branch 'i2p.i2p' (head 2da3b585b42d058e25909bc303d72277ae2463b5)

to branch 'i2p.i2p.zzz.update' (head ebbad994215dc2822e9a1776399864ed77a0e5a0)
2012-10-14 22:42:00 +00:00
parent 8df2a2d00a 20279d1597
commit 4db4010abf
42 changed files with 3010 additions and 1251 deletions
--- a/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java
@ -20,7 +20,7 @@ public class LogsHelper extends HelperBase {
    }

    /** @since 0.8.13 */
-    static String jettyVersion() {
+    public static String jettyVersion() {
        return Server.getVersion();
    }