Merge branch 'master' of github.com:bitcoin/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 22 Mar 2012 12:51:37 +0000 (08:51 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 22 Mar 2012 12:51:37 +0000 (08:51 -0400)
commite53f03172a4b6d89c5a65d367c47f6d126692ca6
treebc60316ace667f22936c9ede468d12ebc35289d2
parent8f188ece3c82c4cf5d52a3363e7643c23169c0ff
parent5cd806a03e4ced3d69ff6e3a8cfc15e015c6a1ab
Merge branch 'master' of github.com:bitcoin/bitcoin