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

author	Luke Dashjr <luke-jr+git@utopios.org>
	Fri, 3 Feb 2012 01:17:41 +0000 (20:17 -0500)
committer	Luke Dashjr <luke-jr+git@utopios.org>
	Fri, 3 Feb 2012 01:17:41 +0000 (20:17 -0500)
commit	882e00e2159ce5e12170c7c1811236a039d8abfa
tree	03e522bdc55f5a11e43c3c2cb2891895ecb704a9	tree \| snapshot
parent	c13d50d8617678c8696b1f33549ed9cc3a0b554e	commit \| diff
parent	c11e2b8679e13f739a58faf2a3439d4aaed24364	commit \| diff

Merge branch '0.4.x' into 0.5.0.x

Conflicts:
src/main.cpp

Novacoin client