Commit ce850883e73f99ef7bd003c9f0eb56e7590f5ecf

Paul Sheppard 2012-07-01T23:39:09

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