git.novaco.in Git - novacoin.git/commit

author	Luke Dashjr <luke-jr+git@utopios.org>
	Sun, 22 Apr 2012 14:07:24 +0000 (10:07 -0400)
committer	Luke Dashjr <luke-jr+git@utopios.org>
	Sun, 22 Apr 2012 14:07:24 +0000 (10:07 -0400)
commit	66116c3847eeb3f0619bc084d96f5add41a156c8
tree	8952b665662e18fd4a1b6ffd5f99a39adab8d92d	tree \| snapshot
parent	c43a9ea77db06b9d101f0551df373d417e5028af	commit \| diff
parent	a93ab877877925c60b2dbf56bdde8aa46b6b7391	commit \| diff

Merge branch '0.5.x' into 0.6.0.x

Conflicts:
src/main.h
src/net.cpp
src/util.cpp

Novacoin client