Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 6 Apr 2012 21:45:20 +0000 (17:45 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 6 Apr 2012 21:45:20 +0000 (17:45 -0400)
commit9bf1140b90387643ad83e89199e391d002352b22
tree63db9580067c0744b12518cad28a36d541079baa
parent892fcaf291cb9fc0f9efd4244f01b6b6529409ba
parent527b512cf754bc7846852f3a4a61d8b364c5abc3
Merge branch '0.5.0.x' into 0.5.x
src/qt/bitcoin.cpp