Merge branch 'master' of https://github.com/bitcoin/bitcoin
authorWladimir J. van der Laan <laanwj@gmail.com>
Fri, 30 Sep 2011 15:39:29 +0000 (17:39 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Fri, 30 Sep 2011 15:39:29 +0000 (17:39 +0200)
commit52e9fe929615d339732c060573b0637c51e353dc
treeb74ae9a0e2db67f7668c9d8235209d3f84796b71
parent8f1631b797f35b377764eaa94b8cdc6489dc292e
parentf4769e44a326f61bdf47fa39346e1293b97e31c4
Merge branch 'master' of https://github.com/bitcoin/bitcoin