Merge branch 'listaddresses' into integration
commit009d5fb41f3aa39baeeb3f72454cdc14459fc67e
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 6 Jan 2011 13:56:10 +0000 (6 08:56 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 6 Jan 2011 13:56:10 +0000 (6 08:56 -0500)
treef1d9af67dc294778d77dc406b8bf626a5bc2759d
parent0ded557af65282350509654e4ec7fb48d7903e8d
parentf86655fdddb519f59ab70043d0c065aca807b94f
Merge branch 'listaddresses' into integration