Commit 2d0c5f9568331f1daa660c16ec412916d96f2342

Con Kolivas 2014-04-17T14:53:32

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