merge of '2f361aff8dd74139e94c6f92e575638347b28b0a'

...2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

core/java/build.xml

core/java/src/net/i2p/data/DataHelper.java

core/java/src/net/i2p/data/DateAndFlags.java

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

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

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

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

core/java/test/net/i2p/data/LeaseSetTest.java

core/java/test/net/i2p/data/RouterAddressTest.java

history.txt

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

...va/src/net/i2p/router/peermanager/CapacityCalculator.java