Commit cc0ad5eaa7635d095cf6ba69305857fe534ba33b

Paul Sheppard 2012-07-01T23:35:06

Merge branch 'master' of git://github.com/ckolivas/cgminer.git Conflicts: driver-bitforce.c