Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Wed, 8 Feb 2012 03:49:03 +0000 (22:49 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Wed, 8 Feb 2012 03:49:03 +0000 (22:49 -0500)
commita21e4da9012f87d2cb8b2c38517efda1999fab05
treefe813787f2d3647b2d220991932c8a1546981bd5
parent06e0f79ae5a4c2c7b3c8232c4544307d4d4940a5
parentb5d9c7d9fb2ddf66e414e22e1d599fb0ef0abb07
Merge branch '0.5.0.x' into 0.5.x

Conflicts:
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_zh_TW.ts
13 files changed:
doc/README
doc/README_windows.txt
src/bitcoinrpc.cpp
src/qt/locale/bitcoin_da.ts
src/qt/locale/bitcoin_de.ts
src/qt/locale/bitcoin_es.ts
src/qt/locale/bitcoin_es_CL.ts
src/qt/locale/bitcoin_nb.ts
src/qt/locale/bitcoin_nl.ts
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_zh_TW.ts
src/serialize.h
src/util.h