Commit fe7c8e8269e9013d8471293ef564a6cac94c1e2c

Con Kolivas 2013-08-18T00:39:13

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