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

author	Luke Dashjr <luke-jr+git@utopios.org>
	Wed, 8 Feb 2012 03:46:07 +0000 (22:46 -0500)
committer	Luke Dashjr <luke-jr+git@utopios.org>
	Wed, 8 Feb 2012 03:46:07 +0000 (22:46 -0500)
commit	b5d9c7d9fb2ddf66e414e22e1d599fb0ef0abb07
tree	fd1969416f825823b2a1262353c731b756929b2a	tree \| snapshot
parent	4bbd72cca108042cdffee74d10fcc7a540da2b51	commit \| diff
parent	4664aae3fe2eba4eec84d20f1e7e701ceeeb49bd	commit \| diff

Merge branch '0.4.x' into 0.5.0.x

Conflicts:
src/bitcoinrpc.cpp

Novacoin client