Merge commit '293f264' into 0.6.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 7 May 2012 04:00:26 +0000 (04:00 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 7 May 2012 04:00:26 +0000 (04:00 +0000)
commit6bcefc1338c6e117219b56d8133a8ca0c055e210
treeea4a4fe6e1eeb756e6ba1f210ca5df2d857cfeeb
parent457ff3a437a1b8907ba072001f935a8c67e9193a
parent293f2644ffd98742caa30b16405b95a6420e8ba0
Merge commit '293f264' into 0.6.0.x
src/qt/bitcoin.cpp
src/qt/walletmodel.cpp