Merge branch 'updateseednodes' of https://github.com/nanotube/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 19 Jan 2012 19:23:49 +0000 (14:23 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 19 Jan 2012 19:23:49 +0000 (14:23 -0500)
1  2 
src/net.cpp

diff --cc src/net.cpp
Simple merge