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)
Resolves issue #922 - "wallet passphrase timeout of several years doesn't work"


Trivial merge