Merge branch '0.4.x' into 0.5.x

Conflicts:
	doc/release-process.txt
	src/serialize.h

diff --cc .gitignore
Simple merge

diff --cc doc/release-process.txt
index 2d483d3,8a236a7..468d037
--- 1/doc/release-process.txt
--- 2/doc/release-process.txt
+++ b/doc/release-process.txt
@@@ -87,45 -44,9 +87,47 @@@
  
  * update forum version
  
 -* update wiki
 -
  * update wiki download links
  
+ * update wiki changelog: https://en.bitcoin.it/wiki/Changelog
+ 
 +* Commit your signature to gitian.sigs:
 +  pushd gitian.sigs
 +  git add ${VERSION}/${SIGNER}
 +  git add ${VERSION}-win32/${SIGNER}
 +  git commit -a
 +  git push  # Assuming you can push to the gitian.sigs tree
 +  popd
 +
 +-------------------------------------------------------------------------
 +
 +* After 3 or more people have gitian-built, repackage gitian-signed zips:
 +
 +  * From a directory containing bitcoin source, gitian.sigs and gitian zips
 +   export VERSION=0.5.1
 +   mkdir bitcoin-${VERSION}-linux-gitian
 +   pushd bitcoin-${VERSION}-linux-gitian
 +   unzip ../bitcoin-${VERSION}-linux-gitian.zip
 +   mkdir gitian
 +   cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/
 +   for signer in $(ls ../gitian.sigs/${VERSION}/); do
 +     cp ../gitian.sigs/${VERSION}/${signer}/bitcoin-build.assert ./gitian/${signer}-build.assert
 +     cp ../gitian.sigs/${VERSION}/${signer}/bitcoin-build.assert.sig ./gitian/${signer}-build.assert.sig
 +   done
 +   zip -r bitcoin-${VERSION}-linux-gitian.zip *
 +   cp bitcoin-${VERSION}-linux-gitian.zip ../
 +   popd
 +   mkdir bitcoin-${VERSION}-win32-gitian
 +   pushd bitcoin-${VERSION}-win32-gitian
 +   unzip ../bitcoin-${VERSION}-win32-gitian.zip
 +   mkdir gitian
 +   cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/
 +   for signer in $(ls ../gitian.sigs/${VERSION}-win32/); do
 +     cp ../gitian.sigs/${VERSION}-win32/${signer}/bitcoin-build.assert ./gitian/${signer}-build.assert
 +     cp ../gitian.sigs/${VERSION}-win32/${signer}/bitcoin-build.assert.sig ./gitian/${signer}-build.assert.sig
 +   done
 +   zip -r bitcoin-${VERSION}-win32-gitian.zip *
 +   cp bitcoin-${VERSION}-win32-gitian.zip ../
 +   popd
 +
 +  * Upload gitian zips to SourceForge

diff --cc src/main.h
Simple merge

diff --cc src/net.cpp
Simple merge

diff --cc src/serialize.h
index b1fabb7,db3c963..61d80d7
--- 1/src/serialize.h
--- 2/src/serialize.h
+++ b/src/serialize.h
@@@ -60,7 -59,7 +60,7 @@@ class CDataStream
  class CAutoFile;
  static const unsigned int MAX_SIZE = 0x02000000;
  
- static const int VERSION = 50600;
 -static const int VERSION = 40701;
++static const int VERSION = 50601;
  static const char* pszSubVer = "";
  static const bool VERSION_IS_BETA = true;
  

diff --cc src/util.cpp
Simple merge