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

author	Gavin Andresen <gavinandresen@gmail.com>
	Thu, 22 Mar 2012 13:19:01 +0000 (09:19 -0400)
committer	Gavin Andresen <gavinandresen@gmail.com>
	Thu, 22 Mar 2012 13:19:01 +0000 (09:19 -0400)
commit	a6b4a11385bf44e695c3e47cbd0de6e40eea0b23
tree	cf0388fcb5169c85b495092e09be6af5a886a236	tree \| snapshot
parent	0e894be626ae15f26f6f1483b38c7e9191bdb638	commit \| diff
parent	5fee401fe14aa6459428a26a82f764db70a6a0b9	commit \| diff

Merge branch 'addrman' of https://github.com/sipa/bitcoin

Novacoin client