From: 0xDEADFACE <masmfan@gmail.com>
Date: Sun, 18 Oct 2015 19:50:58 +0000 (-0700)
Subject: Merge branch 'patch' of https://github.com/svost/novacoin into svost-patch
X-Git-Tag: nvc-v0.5.5~10^2
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=818b0f90fa04259d4f1fff008881ba80381e46b3

Merge branch 'patch' of https://github.com/svost/novacoin into svost-patch

Conflicts:
	novacoin-qt.pro
---

818b0f90fa04259d4f1fff008881ba80381e46b3