Commit 2d1f96104691f6a70ea18ca3c99a785f1c47059b

Paul Sheppard 2012-06-14T00:05:31

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