Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 17 Feb 2012 14:16:19 +0000 (09:16 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 17 Feb 2012 14:16:19 +0000 (09:16 -0500)
commitfb811c31fd28d1d637a50f784af620d085fa32d4
treed665c0e80f5461ca3b819d2cefdf342b90476d77
parent9ab932b76988d41ea83d4c5cfb9353e06922ccaa
parent0365f19dececa3bd84ae28ec4aabb955ffb8b405
Merge branch '0.5.0.x' into 0.5.x

Conflicts:
src/qt/bitcoingui.cpp
bitcoin-qt.pro
src/qt/bitcoingui.h