From: CryptoManiac <balthazar@yandex.ru>
Date: Fri, 25 Jul 2014 17:54:57 +0000 (+0400)
Subject: Merge branch 'master' of github.com:CryptoManiac/novacoin
X-Git-Tag: v0.4.4.6-nvc-update6^2~2
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=b323f5d0cc373b1b6082b665d4a92f0786a5e42d

Merge branch 'master' of github.com:CryptoManiac/novacoin
---

b323f5d0cc373b1b6082b665d4a92f0786a5e42d