Merge branch 'master' of https://github.com/bitcoin/bitcoin

Conflicts:
	.gitignore

diff --cc .gitignore
index 537064d,c1d06a3..29c781c
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -3,12 -3,9 +3,18 @@@ src/bitcoi
  src/bitcoind
  .*.swp
  *.*~*
+ *.bak
+ *.rej
+ *.orig
+ *.o
+ *.patch
+ .bitcoin
 +#compilation and Qt preprocessor part
 +*.o
 +ui_*.h
 +*.qm
 +moc_*
 +Makefile
 +bitcoin-qt
 +#resources cpp
- qrc_*.cpp
++qrc_*.cpp

diff --cc README-original.md
Simple merge

diff --cc src/main.cpp
Simple merge