Merge branch '0.5.x' into 0.6.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 7 May 2012 04:10:54 +0000 (04:10 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 7 May 2012 04:10:54 +0000 (04:10 +0000)
commit1fa846bbb620650867a911753b30e209a303118c
treebf8d530abe0d746754bc1d0a31e3b57499509645
parent60953d05c8cc6eefb0c03d1d39209bdaf54725eb
parentb803009c84b1e7ca16cc5a2105269bc3518970a0
Merge branch '0.5.x' into 0.6.0.x

Conflicts:
src/main.cpp
src/qt/locale/bitcoin_da.ts
src/qt/locale/bitcoin_de.ts
src/qt/locale/bitcoin_en.ts
src/qt/locale/bitcoin_es.ts
src/qt/locale/bitcoin_es_CL.ts
src/qt/locale/bitcoin_hu.ts
src/qt/locale/bitcoin_it.ts
src/qt/locale/bitcoin_nb.ts
src/qt/locale/bitcoin_nl.ts
src/qt/locale/bitcoin_pt_BR.ts
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_uk.ts
src/qt/locale/bitcoin_zh_CN.ts
src/qt/locale/bitcoin_zh_TW.ts