Merge branch '0.6.0.x' into 0.6.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Sun, 6 May 2012 05:37:21 +0000 (05:37 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sun, 6 May 2012 05:37:21 +0000 (05:37 +0000)
commit9b661e57bf7803fc1a73a8906a5c117bbcdc0807
treebf082e6132d8b8d0af20ca1890d78baf958be3c3
parente2b9bf9e6e846d2b182baf889f556e624c02e7a8
parent457ff3a437a1b8907ba072001f935a8c67e9193a
Merge branch '0.6.0.x' into 0.6.x

Conflicts:
src/bitcoinrpc.cpp
src/db.cpp
src/addrman.cpp
src/addrman.h