Merge branch 'master' of github.com:novacoin-project/novacoin
authorCryptoManiac <balthazar@yandex.ru>
Thu, 1 Oct 2015 21:33:54 +0000 (14:33 -0700)
committerCryptoManiac <balthazar@yandex.ru>
Thu, 1 Oct 2015 21:33:54 +0000 (14:33 -0700)
commitfc09efb337c6c8e74bf40264420d3ae588592524
tree04c86be6b07b6924693552a3efa0634b9c689055
parent2b7a034aef23343d902ce8430747f321ce10b294
parent704a3eca59995960dd68619f3d69da79627f5337
Merge branch 'master' of github.com:novacoin-project/novacoin