per tenebras venirent ad lucem
changes
changes
changes
changes
changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	INSTALL
	Info.plist
	README
	README.md
	contrib/debian/bin/bitcoind
	contrib/debian/rules
	contrib/macdeploy/macdeployqtplus
	contrib/pyminer/pyminer.py
	contrib/qt_translations.py
	doc/README_windows.txt
	doc/coding.txt
	share/genbuild.sh
	share/qt/extract_strings_qt.py
	share/qt/make_spinner.py
	share/qt/make_windows_icon.sh
	share/setup.nsi
	share/ui.rc
	src/bitcoinrpc.cpp
	src/geocoind
	src/init.cpp
	src/irc.cpp
	src/main.cpp
	src/net.cpp
	src/qt/askpassphrasedialog.cpp
	src/qt/bitcoin.cpp
	src/qt/bitcoingui.cpp
	src/qt/bitcoinstrings.cpp
	src/qt/bitcoinunits.cpp
	src/qt/editaddressdialog.cpp
	src/qt/forms/aboutdialog.ui
	src/qt/guiutil.cpp
	src/qt/guiutil.h
	src/qt/miningpage.cpp
	src/qt/optionsdialog.cpp
	src/qt/overviewpage.cpp
	src/qt/qrcodedialog.cpp
	src/qt/qtipcserver.cpp
	src/qt/rpcconsole.cpp
	src/qt/sendcoinsentry.cpp
	src/qt/test/test_main.cpp
	src/rpcdump.cpp
	src/util.cpp