Merge branch '0.5.x' into 0.6.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 4 May 2012 18:57:03 +0000 (18:57 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 4 May 2012 18:57:03 +0000 (18:57 +0000)
commita1a5a890631beaf40236ab417b2f9816ccbae5a1
treef4a760bb91cab4a4e16b2338650d1665e2eef02d
parent6c055e506d93ba3f6bf448f4633a774208be735c
parentb2e5f797b5670c4dc7d0dfd696d21977575fe9ed
Merge branch '0.5.x' into 0.6.0.x

Conflicts:
src/main.cpp
src/serialize.h
bitcoin-qt.pro
src/main.cpp
src/serialize.h
src/util.cpp
src/wallet.h