Merge remote branch 'upstream/master'
authorWladimir J. van der Laan <laanwj@gmail.com>
Tue, 26 Jul 2011 13:38:31 +0000 (15:38 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Tue, 26 Jul 2011 14:47:23 +0000 (16:47 +0200)
commit491ad6db507776054c38230387f384991f42ad29
tree7d708a59cb5f61f9d970950c528889dec8fde8d5
parentc0b892fee89cba7d1fda5fda2d2fc7e966643be1
parenta9ba47101a46533ff0418d6868ebc9bf5c889818
Merge remote branch 'upstream/master'

Conflicts:
src/bitcoinrpc.cpp
src/bitcoinrpc.cpp
src/init.cpp
src/main.cpp
src/qt/addresstablemodel.cpp
src/qt/transactiondesc.cpp
src/qt/transactionrecord.cpp
src/qt/walletmodel.cpp
src/script.cpp
src/wallet.cpp
src/wallet.h