Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 3 Jan 2012 17:23:09 +0000 (12:23 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 3 Jan 2012 17:23:09 +0000 (12:23 -0500)
commita2e9767225d3c3fa55f31c2494a3a2f54a65f87f
tree67460aca4b75a21357f4906ded77c346d0181d50
parent20e3f2aefc6071af1d4e0754053f2fb88061ee9a
parentfb88f1cc97d52d8cd5bc49169a1bcd4df735fc52
Merge branch '0.5.0.x' into 0.5.x
src/qt/locale/bitcoin_es.ts
src/qt/locale/bitcoin_es_CL.ts
src/util.h