Merge branch '0.5.0.x' into 0.5.3.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 16 Mar 2012 21:28:22 +0000 (17:28 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 16 Mar 2012 21:28:36 +0000 (17:28 -0400)
1  2 
bitcoin-qt.pro

diff --cc bitcoin-qt.pro
Simple merge