Commit e037028159dc23da4a91b5fe7558546f22211701

Paul Sheppard 2012-06-19T10:40:00

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