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

author	Luke Dashjr <luke-jr+git@utopios.org>
	Mon, 16 Apr 2012 01:05:54 +0000 (21:05 -0400)
committer	Luke Dashjr <luke-jr+git@utopios.org>
	Mon, 16 Apr 2012 01:05:54 +0000 (21:05 -0400)
commit	79fc752b6104b796aa5e0a8a8b6d2822fb0f3299
tree	7ae039ced8787d0fe10e1150f3dcf249524c6a4c	tree \| snapshot
parent	fdcafa35359b3ad9af79d2367a1884d01607fb84	commit \| diff
parent	8460185dec74383b1e49500683cfc7aa9ceba554	commit \| diff

Merge branch '0.4.x' into 0.5.0.x

Conflicts:
src/keystore.h

Novacoin client