Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 27 Mar 2012 00:07:28 +0000 (20:07 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 27 Mar 2012 00:07:28 +0000 (20:07 -0400)
1  2 
bitcoin-qt.pro
share/setup.nsi

diff --cc bitcoin-qt.pro
Simple merge
diff --cc share/setup.nsi
Simple merge