Merge branch '0.4.x' into 0.5.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Sat, 3 Mar 2012 18:59:19 +0000 (13:59 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sat, 3 Mar 2012 18:59:19 +0000 (13:59 -0500)
commit7013cc3d9710c0a03f6587c854e4e50c358ea70c
tree35e3c2ff533126be6d8d495eb6cf33d62b609014
parentef48e9b7dfde66368c27ed34f5f42de1b8e781f9
parent88aa771536014919e955c4f7b2cada9a0dcf8561
Merge branch '0.4.x' into 0.5.0.x
src/bitcoinrpc.cpp
src/key.h
src/main.cpp
src/main.h
src/util.cpp
src/wallet.cpp