Merge branch 'master' of github.com:novacoin-project/novacoin
authorCryptoManiac <balthazar@yandex.ru>
Mon, 21 Mar 2016 18:09:48 +0000 (21:09 +0300)
committerCryptoManiac <balthazar@yandex.ru>
Mon, 21 Mar 2016 18:09:48 +0000 (21:09 +0300)
1  2 
src/rpcwallet.cpp

Simple merge