merge of '476489c04057318947e2947393aa6a10aa382af8'

and 'd38ab82268c3643119e5c226a3f97c23fb794e93'
2009-05-12 22:32:49 +00:00
parent 7cd0112211 66a292a9c6
commit a267fcc9cc
5 changed files with 24 additions and 37 deletions
--- a/history.txt
+++ b/history.txt
@ -1,3 +1,7 @@
+2009-05-12 sponge
+    * BOB clean up, change println's to _log.warn, bump BOB version
+    * I2PSessionMuxedImpl.java changes as per zzz, and they test OK for me.
+
 2009-05-12 mkvore
    * SAM: fix: warnings when generating javadoc