Merge branch '0.4.x' into 0.5.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 16 Mar 2012 20:44:00 +0000 (16:44 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 16 Mar 2012 20:44:00 +0000 (16:44 -0400)
commit78b9d2de40144e6f420518bcdf62168855546ded
treeb1f761e093bc60f82c793f3144f226d0d7e666fb
parent27960a36de879634ee8c491d0f4fe8160e8a4f75
parent91aadbdacf9a3111da76eb831ea36d6827e1d6fc
Merge branch '0.4.x' into 0.5.0.x

Conflicts:
contrib/Bitcoin.app/Contents/Info.plist
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h
src/key.h
src/main.cpp