From: CryptoManiac <balthazar@yandex.ru>
Date: Sun, 30 Aug 2015 17:42:00 +0000 (+0300)
Subject: Merge branch 'master' of https://github.com/CryptoManiac/NovacoinLibrary
X-Git-Url: https://git.novaco.in/?p=NovacoinLibrary.git;a=commitdiff_plain;h=5aac8795a5ce227a2f9340f7cdf9746f781101f6;hp=5c9959adf8c0173dce35d97042f1b93d593fee0d

Merge branch 'master' of https://github.com/CryptoManiac/NovacoinLibrary

Conflicts:
	Novacoin/CTransaction.cs
---