Commit baa480c1378cdf95372eaea15e7c7a77bb47f836

Paul Sheppard 2012-06-28T08:22:55

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