merge of '8c614ff109c2cc345b90363355950ab46989dab8'

android/README.txt

apps/routerconsole/java/bmsg.sh

apps/routerconsole/java/bundle-messages.sh

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

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

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

...java/src/net/i2p/router/web/ProfileOrganizerRenderer.java

...erconsole/java/src/net/i2p/router/web/StatsGenerator.java

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

apps/routerconsole/jsp/stats.jsp

apps/routerconsole/locale/messages_zh.po

build.xml

checklist.txt

history.txt

installer/resources/countries.txt

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

...net/i2p/router/networkdb/kademlia/TransientDataStore.java

router/java/src/net/i2p/router/peermanager/DBHistory.java

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

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