Commit 4306aa712c40820d67cbe6a88be5d3306e273420

ckolivas 2013-09-06T09:24:15

Merge branches 'master' and 'master' of github.com:ckolivas/cgminer