merge of 'cc7dee6f711dd10db6c1f42af8dc7ba6f6b0002d'

...outerconsole/java/src/net/i2p/router/web/GraphHelper.java

...terconsole/java/src/net/i2p/router/web/UpdateHandler.java

checklist.txt

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

history.txt

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

...et/i2p/router/networkdb/kademlia/PersistentDataStore.java

router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java

router/java/src/net/i2p/router/tunnel/pool/ExpireJob.java

router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java