Merge branch '0.5.x' into 0.6.0.x
[novacoin.git] / src / addrman.cpp
2012-02-24 Pieter WuilleCAddrMan: stochastic address manager