Merge branch 'master' of github.com:novacoin-project/novacoin
authorCryptoManiac <balthazar@yandex.ru>
Sun, 3 Apr 2016 23:27:59 +0000 (02:27 +0300)
committerCryptoManiac <balthazar@yandex.ru>
Sun, 3 Apr 2016 23:27:59 +0000 (02:27 +0300)
commit396877e60214f233b88100fa2831a97c5600e3f4
treec07269041271c5d493fae5587c689d767134bec9
parent7124035567b03ca15027318b75f3a398ae7b4d89
parent2404891de8ac5b357d0abde90f2e286a3153fdef
Merge branch 'master' of github.com:novacoin-project/novacoin