Commit fe4c0869bfb1becabcb61eaf2e3d921f27b99361

Paul Sheppard 2012-06-17T09:44:42

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