Merge branch 'master' of github.com:novacoin-project/novacoin
authorCryptoManiac <balthazar@yandex.ru>
Sun, 13 Jul 2014 23:29:32 +0000 (03:29 +0400)
committerCryptoManiac <balthazar@yandex.ru>
Sun, 13 Jul 2014 23:29:32 +0000 (03:29 +0400)
commit5ddff22bc2fdd6a290300a0f285b039dbcdf3406
tree01787974ccd19e11a8e6bac3f7963fb0fa7ac49e
parenta3b8fbc4443829bfc133ed407c5e3865b4b9d400
parent1229ee33a75d14fea0d3ce16c9a8aa6d289265b7
Merge branch 'master' of github.com:novacoin-project/novacoin