Commit f45cfd006034555d7209ec1758f030e11a359d39

Con Kolivas 2014-06-16T10:33:26

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