Merge branch '0.4.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 22 May 2012 22:55:49 +0000 (22:55 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 22 May 2012 22:55:49 +0000 (22:55 +0000)
commit3b36da6d277c6f5ad671343e724e0336ce55c893
tree1e3761e0276bc4ea9b571868f61c4ae7fce7c3e6
parent087fc28f7d4e82a0b79dabbaa19358e48d3084fe
parenta2de1ea2d5776289c247bbc18c1ed13e16a4169f
Merge branch '0.4.x' into 0.5.x

Conflicts:
src/ui.cpp
src/ui.h
src/uibase.cpp
src/xpm/about.xpm
src/bitcoinrpc.cpp
src/db.cpp
src/main.cpp
src/main.h
src/wallet.cpp