Commit 1bb6dd406af94f310c48cf8a9026d8f8e93203af

Con Kolivas 2013-08-16T13:57:54

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