Commit c17a175e172b5e5acaefedaab2e58026eb29a0fb

Con Kolivas 2013-04-10T18:39:50

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