merge of '20f5a25a77de641ddf49c4d47d4ede923b59bfa3'

and '7dfc6bc466e7b6ee3212af949a08c51d4e3dd3db'
2010-05-25 19:08:31 +00:00
parent 618275b1f9 3af356840e
commit 4dc6fc3b5d
22 changed files with 105 additions and 52 deletions
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2010-05-24 zzz
+    * i2psnark: Listing icons and cleanups
+
 2010-05-23 welterde
    * core:
      - fixed major security hole in DatagramDissector