Merge remote-tracking branch 'remotes/origin_project/master'
authorCryptoManiac <balthazar@yandex.ru>
Sun, 3 Aug 2014 18:37:41 +0000 (22:37 +0400)
committerCryptoManiac <balthazar@yandex.ru>
Sun, 3 Aug 2014 18:37:41 +0000 (22:37 +0400)
1  2 
src/wallet.h

diff --cc src/wallet.h
Simple merge