bitcoin/bitcoin — pull request #2781 by sipa (2013-06-19 23:17:41+00:00)
Title: Refactor keytime/metadata and wallet encryption bugfix

Refactor keytime:
* Key metadata is kept in a CWallet::mapKeyMetaData (std::map