Merge branch 'master' of https://github.com/bitcoin/bitcoin
authorWladimir J. van der Laan <laanwj@gmail.com>
Wed, 27 Jul 2011 19:44:55 +0000 (21:44 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Wed, 27 Jul 2011 19:44:55 +0000 (21:44 +0200)
commitb5b1d1a66b9f418c9fb293cb1cc3eac09a711c4e
tree0efbb26069cf36cc64775ba0a50c62a7e7f644aa
parent7df001be9449bf99e720d6e750d282b77eda5a51
parenta139ed74f2a5764afbd678c0e4eb6143455a3a49
Merge branch 'master' of https://github.com/bitcoin/bitcoin

Conflicts:
src/script.cpp
src/qt/transactiondesc.cpp
src/qt/transactionrecord.cpp
src/script.cpp
src/wallet.cpp