Merge pull request #926 from gmaxwell/master
authorPieter Wuille <pieter.wuille@gmail.com>
Mon, 12 Mar 2012 01:41:00 +0000 (18:41 -0700)
committerPieter Wuille <pieter.wuille@gmail.com>
Mon, 12 Mar 2012 01:41:00 +0000 (18:41 -0700)
commit336ba312a6ddc08f40ce456bfd09f0711bdc78dc
tree7629dc24efea6c45289478741b4b01b60128c7d6
parent4585d828b490f826cf863353d1cdf41ec4cb0724
parent82a10c81707dcff5ee24dec7ef7ebf8eccfded03
Merge pull request #926 from gmaxwell/master

Resolves issue #922 - "wallet passphrase timeout of several years doesn't work"