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)
commit7012b124bc7bbd80f7219c8122f06143c1c6c32f
tree2ff4273f424041314facfa5df86ac2bfc7243644
parentc55fd06b990df44df88775d3333d43ad740d726f
parentb2f76e9deda9e00720e159cfb6557c81d6f65182
Merge branch 'updateseednodes' of https://github.com/nanotube/bitcoin
src/net.cpp