Luke Dashjr 894ce6d88d Merge branch '0.6.0.x' into 0.6.x ...

Conflicts:
	src/qt/locale/bitcoin_fa.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_sv.ts

2012-09-11 00:02:46 +00:00

1.1 KiB

Raw Blame History

View Raw