Commit 4889d7ecb23ffe70402d931350c6f69145530752

Paul Sheppard 2012-06-11T13:09:27

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