Merge branch 'jlouis/enter-bad-peers'
commit1ad5f9cc1d4f75c1df39f29d35186873aa8c4cae
authorJesper Louis Andersen <jesper.louis.andersen@gmail.com>
Sat, 26 Jul 2008 00:38:15 +0000 (26 02:38 +0200)
committerJesper Louis Andersen <jesper.louis.andersen@gmail.com>
Sat, 26 Jul 2008 00:38:15 +0000 (26 02:38 +0200)
tree7b5fff827b07d36052a8a5c2f2447f5ba4da0960
parentdf38f6b73639e7e4bb4ebe865ea404ecbf2c87c1
parent7440c56e6f9488862863807b413e88b5bc158b8e
Merge branch 'jlouis/enter-bad-peers'