MUE 1.0
MUE 1.0
MUE 1.0
MUE 1.0
MUE 1.0
MUE 1.0
MUE 1.0
MUE 1.0
MUE 1.0
MUE 1.0
MUE 1.0
MERGE: CCheckpointData update

CCheckpointData update
Merge commit 'a771493063f224aaaff5f0cd3d51bb4f5ac06a7f' into origin/master

Conflicts:
	COPYING
	INSTALL
	README.md
	contrib/bitcoind.bash-completion
	contrib/bitrpc/bitrpc.py
	contrib/debian/bitcoin-qt.desktop
	contrib/debian/bitcoin-qt.install
	contrib/debian/bitcoind.install
	contrib/debian/changelog
	contrib/debian/control
	contrib/debian/copyright
	contrib/debian/manpages/bitcoin.conf.5
	contrib/debian/rules
	contrib/gitian-downloader/linux-download-config
	contrib/gitian-downloader/win32-download-config
	contrib/macdeploy/macdeployqtplus
	contrib/pyminer/example-config.cfg
	contrib/pyminer/pyminer.py
	contrib/qt_translations.py
	contrib/seeds/makeseeds.py
	contrib/spendfrom/spendfrom.py
	contrib/testgen/gen_base58_test_vectors.py
	contrib/tidy_datadir.sh
	contrib/verifysfbinaries/verify.sh
	doc/Doxyfile
	doc/README.md
	doc/README_windows.txt
	doc/bitcoin_logo_doxygen.png
	doc/build-msw.md
	doc/build-osx.md
	doc/build-unix.md
	doc/coding.md
	doc/multiwallet-qt.md
	doc/release-notes.md
	doc/release-process.md
	doc/translation_process.md
	doc/unit-tests.md
	share/genbuild.sh
	share/pixmaps/bitcoin-bc.ico
	share/pixmaps/bitcoin.ico
	share/pixmaps/bitcoin128.png
	share/pixmaps/bitcoin16.png
	share/pixmaps/bitcoin256.png
	share/pixmaps/bitcoin32.png
	share/pixmaps/bitcoin64.png
	share/qt/Info.plist
	share/qt/extract_strings_qt.py
	share/qt/make_spinner.py
	share/qt/make_windows_icon.sh
	share/ui.rc
	src/addrman.cpp
	src/addrman.h
	src/alert.cpp
	src/alert.h
	src/allocators.h
	src/base58.h
	src/bignum.h
	src/bloom.cpp
	src/bloom.h
	src/checkpoints.cpp
	src/checkpoints.h
	src/checkqueue.h
	src/clientversion.h
	src/compat.h
	src/crypter.cpp
	src/crypter.h
	src/db.cpp
	src/db.h
	src/hash.cpp
	src/hash.h
	src/init.cpp
	src/init.h
	src/json/json_spirit_reader_template.h
	src/json/json_spirit_value.h
	src/json/json_spirit_writer_template.h
	src/key.cpp
	src/key.h
	src/keystore.cpp
	src/keystore.h
	src/leveldb/AUTHORS
	src/leveldb/Makefile
	src/leveldb/build_detect_platform
	src/leveldb/db/corruption_test.cc
	src/leveldb/db/db_bench.cc
	src/leveldb/db/db_impl.cc
	src/leveldb/db/db_impl.h
	src/leveldb/db/db_iter.cc
	src/leveldb/db/db_iter.h
	src/leveldb/db/db_test.cc
	src/leveldb/db/dbformat.cc
	src/leveldb/db/dbformat.h
	src/leveldb/db/filename.cc
	src/leveldb/db/filename.h
	src/leveldb/db/filename_test.cc
	src/leveldb/db/log_reader.cc
	src/leveldb/db/log_test.cc
	src/leveldb/db/repair.cc
	src/leveldb/db/table_cache.cc
	src/leveldb/db/version_set.cc
	src/leveldb/db/version_set.h
	src/leveldb/doc/impl.html
	src/leveldb/include/leveldb/c.h
	src/leveldb/include/leveldb/db.h
	src/leveldb/include/leveldb/env.h
	src/leveldb/include/leveldb/slice.h
	src/leveldb/port/atomic_pointer.h
	src/leveldb/port/port_posix.h
	src/leveldb/port/port_win.cc
	src/leveldb/table/block.cc
	src/leveldb/table/filter_block_test.cc
	src/leveldb/table/table.cc
	src/leveldb/table/table_test.cc
	src/leveldb/util/arena.cc
	src/leveldb/util/arena.h
	src/leveldb/util/arena_test.cc
	src/leveldb/util/bloom_test.cc
	src/leveldb/util/cache.cc
	src/leveldb/util/coding_test.cc
	src/leveldb/util/env_posix.cc
	src/leveldb/util/hash.cc
	src/leveldb/util/random.h
	src/leveldb/util/testharness.cc
	src/leveldb/util/testutil.cc
	src/leveldb/util/testutil.h
	src/limitedmap.h
	src/main.cpp
	src/main.h
	src/mruset.h
	src/net.cpp
	src/net.h
	src/netbase.cpp
	src/netbase.h
	src/noui.cpp
	src/protocol.cpp
	src/protocol.h
	src/qt/addressbookpage.cpp
	src/qt/addressbookpage.h
	src/qt/addresstablemodel.cpp
	src/qt/addresstablemodel.h
	src/qt/askpassphrasedialog.cpp
	src/qt/askpassphrasedialog.h
	src/qt/bitcoin.cpp
	src/qt/bitcoin.qrc
	src/qt/bitcoinaddressvalidator.cpp
	src/qt/bitcoinaddressvalidator.h
	src/qt/bitcoinamountfield.cpp
	src/qt/bitcoinamountfield.h
	src/qt/bitcoingui.cpp
	src/qt/bitcoingui.h
	src/qt/bitcoinstrings.cpp
	src/qt/bitcoinunits.cpp
	src/qt/bitcoinunits.h
	src/qt/clientmodel.cpp
	src/qt/clientmodel.h
	src/qt/csvmodelwriter.cpp
	src/qt/csvmodelwriter.h
	src/qt/editaddressdialog.cpp
	src/qt/editaddressdialog.h
	src/qt/forms/aboutdialog.ui
	src/qt/forms/addressbookpage.ui
	src/qt/forms/askpassphrasedialog.ui
	src/qt/forms/editaddressdialog.ui
	src/qt/forms/optionsdialog.ui
	src/qt/forms/overviewpage.ui
	src/qt/forms/rpcconsole.ui
	src/qt/forms/sendcoinsdialog.ui
	src/qt/forms/sendcoinsentry.ui
	src/qt/forms/signverifymessagedialog.ui
	src/qt/forms/transactiondescdialog.ui
	src/qt/guiconstants.h
	src/qt/guiutil.cpp
	src/qt/guiutil.h
	src/qt/locale/bitcoin_af_ZA.ts
	src/qt/locale/bitcoin_ar.ts
	src/qt/locale/bitcoin_bg.ts
	src/qt/locale/bitcoin_bs.ts
	src/qt/locale/bitcoin_ca.ts
	src/qt/locale/bitcoin_ca_ES.ts
	src/qt/locale/bitcoin_cs.ts
	src/qt/locale/bitcoin_cy.ts
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_el_GR.ts
	src/qt/locale/bitcoin_en.ts
	src/qt/locale/bitcoin_eo.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_et.ts
	src/qt/locale/bitcoin_eu_ES.ts
	src/qt/locale/bitcoin_fa.ts
	src/qt/locale/bitcoin_fa_IR.ts
	src/qt/locale/bitcoin_fi.ts
	src/qt/locale/bitcoin_fr.ts
	src/qt/locale/bitcoin_fr_CA.ts
	src/qt/locale/bitcoin_gu_IN.ts
	src/qt/locale/bitcoin_he.ts
	src/qt/locale/bitcoin_hi_IN.ts
	src/qt/locale/bitcoin_hr.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_ja.ts
	src/qt/locale/bitcoin_la.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_lv_LV.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_pt_PT.ts
	src/qt/locale/bitcoin_ro_RO.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_sk.ts
	src/qt/locale/bitcoin_sr.ts
	src/qt/locale/bitcoin_sv.ts
	src/qt/locale/bitcoin_th_TH.ts
	src/qt/locale/bitcoin_tr.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
	src/qt/macdockiconhandler.h
	src/qt/macdockiconhandler.mm
	src/qt/monitoreddatamapper.cpp
	src/qt/monitoreddatamapper.h
	src/qt/notificator.cpp
	src/qt/notificator.h
	src/qt/optionsdialog.cpp
	src/qt/optionsdialog.h
	src/qt/optionsmodel.cpp
	src/qt/optionsmodel.h
	src/qt/overviewpage.cpp
	src/qt/overviewpage.h
	src/qt/paymentserver.cpp
	src/qt/paymentserver.h
	src/qt/qvalidatedlineedit.cpp
	src/qt/qvalidatedlineedit.h
	src/qt/qvaluecombobox.cpp
	src/qt/qvaluecombobox.h
	src/qt/res/icons/add.png
	src/qt/res/icons/address-book.png
	src/qt/res/icons/bitcoin.icns
	src/qt/res/icons/bitcoin.ico
	src/qt/res/icons/bitcoin.png
	src/qt/res/icons/bitcoin_testnet.ico
	src/qt/res/icons/bitcoin_testnet.png
	src/qt/res/icons/clock1.png
	src/qt/res/icons/clock2.png
	src/qt/res/icons/clock3.png
	src/qt/res/icons/clock4.png
	src/qt/res/icons/clock5.png
	src/qt/res/icons/configure.png
	src/qt/res/icons/connect0_16.png
	src/qt/res/icons/connect1_16.png
	src/qt/res/icons/connect2_16.png
	src/qt/res/icons/connect3_16.png
	src/qt/res/icons/connect4_16.png
	src/qt/res/icons/debugwindow.png
	src/qt/res/icons/edit.png
	src/qt/res/icons/editcopy.png
	src/qt/res/icons/editpaste.png
	src/qt/res/icons/export.png
	src/qt/res/icons/filesave.png
	src/qt/res/icons/history.png
	src/qt/res/icons/key.png
	src/qt/res/icons/lock_closed.png
	src/qt/res/icons/lock_open.png
	src/qt/res/icons/overview.png
	src/qt/res/icons/qrcode.png
	src/qt/res/icons/quit.png
	src/qt/res/icons/receive.png
	src/qt/res/icons/remove.png
	src/qt/res/icons/send.png
	src/qt/res/icons/synced.png
	src/qt/res/icons/toolbar.png
	src/qt/res/icons/toolbar_testnet.png
	src/qt/res/icons/transaction0.png
	src/qt/res/icons/transaction2.png
	src/qt/res/icons/tx_inout.png
	src/qt/res/icons/tx_input.png
	src/qt/res/icons/tx_mined.png
	src/qt/res/icons/tx_output.png
	src/qt/res/images/splash.png
	src/qt/res/images/splash_testnet.png
	src/qt/res/src/bitcoin.svg
	src/qt/rpcconsole.cpp
	src/qt/rpcconsole.h
	src/qt/sendcoinsdialog.cpp
	src/qt/sendcoinsdialog.h
	src/qt/sendcoinsentry.cpp
	src/qt/sendcoinsentry.h
	src/qt/signverifymessagedialog.cpp
	src/qt/signverifymessagedialog.h
	src/qt/splashscreen.cpp
	src/qt/splashscreen.h
	src/qt/transactiondesc.cpp
	src/qt/transactiondesc.h
	src/qt/transactiondescdialog.cpp
	src/qt/transactiondescdialog.h
	src/qt/transactionfilterproxy.cpp
	src/qt/transactionfilterproxy.h
	src/qt/transactionrecord.cpp
	src/qt/transactionrecord.h
	src/qt/transactiontablemodel.cpp
	src/qt/transactiontablemodel.h
	src/qt/transactionview.cpp
	src/qt/transactionview.h
	src/qt/walletframe.cpp
	src/qt/walletframe.h
	src/qt/walletmodel.cpp
	src/qt/walletmodel.h
	src/qt/walletview.cpp
	src/qt/walletview.h
	src/rpcblockchain.cpp
	src/rpcdump.cpp
	src/rpcmining.cpp
	src/rpcnet.cpp
	src/rpcrawtransaction.cpp
	src/rpcwallet.cpp
	src/script.cpp
	src/script.h
	src/serialize.h
	src/sync.cpp
	src/sync.h
	src/test/Checkpoints_tests.cpp
	src/test/DoS_tests.cpp
	src/test/accounting_tests.cpp
	src/test/alert_tests.cpp
	src/test/allocator_tests.cpp
	src/test/base32_tests.cpp
	src/test/base58_tests.cpp
	src/test/base64_tests.cpp
	src/test/bignum_tests.cpp
	src/test/bloom_tests.cpp
	src/test/canonical_tests.cpp
	src/test/checkblock_tests.cpp
	src/test/compress_tests.cpp
	src/test/getarg_tests.cpp
	src/test/key_tests.cpp
	src/test/miner_tests.cpp
	src/test/mruset_tests.cpp
	src/test/multisig_tests.cpp
	src/test/netbase_tests.cpp
	src/test/pmt_tests.cpp
	src/test/rpc_tests.cpp
	src/test/script_P2SH_tests.cpp
	src/test/script_tests.cpp
	src/test/serialize_tests.cpp
	src/test/sigopcount_tests.cpp
	src/test/test_bitcoin.cpp
	src/test/transaction_tests.cpp
	src/test/uint256_tests.cpp
	src/test/util_tests.cpp
	src/test/wallet_tests.cpp
	src/threadsafety.h
	src/txdb.cpp
	src/txdb.h
	src/ui_interface.h
	src/uint256.h
	src/util.cpp
	src/util.h
	src/version.cpp
	src/version.h
	src/wallet.cpp
	src/wallet.h
	src/walletdb.cpp
	src/walletdb.h