Commit 22ca87dbf2aa9fcb6b8ca8484a2b9847e9bfbbc0

Con Kolivas 2013-08-31T21:32:15

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