Merge branch 'jlouis/enter-bad-peers' into next
commitfe27482623c3721ea5654d562b1f8ec1bce60266
authorJesper Louis Andersen <jesper.louis.andersen@gmail.com>
Tue, 22 Jul 2008 21:08:45 +0000 (22 23:08 +0200)
committerJesper Louis Andersen <jesper.louis.andersen@gmail.com>
Tue, 22 Jul 2008 21:08:45 +0000 (22 23:08 +0200)
tree7b5fff827b07d36052a8a5c2f2447f5ba4da0960
parentdf38f6b73639e7e4bb4ebe865ea404ecbf2c87c1
parent7440c56e6f9488862863807b413e88b5bc158b8e
Merge branch 'jlouis/enter-bad-peers' into next