Merge branch '0.5.x' into 0.6.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 5 Apr 2012 22:22:47 +0000 (18:22 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 5 Apr 2012 22:22:47 +0000 (18:22 -0400)
commit3e0e10add3f8d1dffd419dc8968935b124389690
tree31e0e3984b3d95779a16a666dc174cdd5072f5ff
parentfe1725a141334dab82ca007fb6fc983c358e35b2
parent0d10cb7a1f6314760ef8895490e5c1042c3549b1
Merge branch '0.5.x' into 0.6.0.x

Conflicts:
src/keystore.cpp
src/crypter.cpp
src/keystore.cpp
src/qt/bitcoingui.cpp