always check git diff
versioning now includes the commit hash, or -final for tagged releases
always check git diff
versioning now includes the commit hash, or -final for tagged releases
Merge branch 'master' of http://github.com/fluffypony/bitmonero

Conflicts:
	src/daemon/daemon.cpp
Merge pull request #132 from fluffypony/master

versioning now includes the commit hash, or -final for tagged releases