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

author	Wladimir J. van der Laan <laanwj@gmail.com>
	Fri, 2 Sep 2011 15:35:30 +0000 (17:35 +0200)
committer	Wladimir J. van der Laan <laanwj@gmail.com>
	Fri, 2 Sep 2011 15:35:30 +0000 (17:35 +0200)
commit	7a15d4ff67c9a6e3b6b5a63f82f76ffe1937c3b8
tree	8ac8a0e7b9994ade96f635dd261c5ae46703f7df	tree \| snapshot
parent	f43f46c175d7e6d7426536f8efcad05d2eafba80	commit \| diff
parent	86fd7c5af6cf3f907c50cf25ff844cd23e271c70	commit \| diff

Merge branch 'master' of https://github.com/bitcoin/bitcoin

Conflicts:
src/main.cpp

Novacoin client