Commit 12954a9455a7f2dafc1e91ae24846165a9e51c29

Con Kolivas 2014-03-13T19:51:47

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