Merge branch 'keepnode' of https://github.com/TheBlueMatt/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 16 Jan 2012 21:45:43 +0000 (16:45 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 16 Jan 2012 21:45:43 +0000 (16:45 -0500)
commit8498c591448d01a8a8ccc5ad1e8cbee9dbcf1500
tree5084f2fedb69b5c3a58e2ea915b27adbf189c0e0
parent5dc090009ea3b943d9b474555eea04acf6b6a972
parent10ba0a3efc350b82d1415736a545f17e739c0098
Merge branch 'keepnode' of https://github.com/TheBlueMatt/bitcoin
src/net.cpp
src/netbase.cpp