| commit | 129ea8026394371ff4dad5c339f0a020b8ea5a95 | |
| author | Jesper Louis Andersen <jesper.louis.andersen@gmail.com> | |
| Sun, 20 Jul 2008 12:17:04 +0000 (20 14:17 +0200) | ||
| committer | Jesper Louis Andersen <jesper.louis.andersen@gmail.com> | |
| Sun, 20 Jul 2008 12:17:04 +0000 (20 14:17 +0200) | ||
| tree | 715ba4ed963710e33d1f9cb9eb8888b7f4623bc4 | treesnapshot (tar.gz zip) |
| parent | 63cce2e611f4254fe790d1bcd51914d6547c08b8 | commitdiff |
| parent | 03e99fb071e736eea84ac22eefcd44ab6f60b324 | commitdiff |
Merge branch 'jlouis/bad-peer-manager' into next
Conflicts:
lib/etorrent-1.0/src/etorrent_t_peer_group_mgr.erl
Conflicts:
lib/etorrent-1.0/src/etorrent_t_peer_group_mgr.erl
| lib/etorrent-1.0/src/etorrent_t_peer_group_mgr.erl | diff1 | diff2 | blobhistory |