Merge branch 'master' of github.com:bitcoin/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 29 Mar 2012 19:11:04 +0000 (15:11 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 29 Mar 2012 19:11:04 +0000 (15:11 -0400)
commita1c3d8f14dca6a86fa103d86ef125e95372f860c
tree4bfe133e5ca62a905765df04856e22ec0965f024
parentf3f9da868e00008d468eee41432afaff1144ae58
parentf146061d24e5b7963250b48c2326f123187ed6b1
Merge branch 'master' of github.com:bitcoin/bitcoin