From: Jeff Garzik <jeff@garzik.org>
Date: Mon, 9 May 2011 18:00:14 +0000 (-0400)
Subject: Manual merge of jaromil's source tree reorg commit.
X-Git-Tag: v0.4.0-unstable~234^2~87^2
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=b17be7e14b4a62b7935c75fe7e7645e736fd68d2

Manual merge of jaromil's source tree reorg commit.

Conflicts:
	src/sha256.cpp
---

b17be7e14b4a62b7935c75fe7e7645e736fd68d2