Commit f80c90033653d33cf52fc5e33a6cab2fcd9ec110

Con Kolivas 2013-10-08T20:46:36

Merge branch 'master' into async Conflicts: api.c cgminer.c miner.h usbutils.c util.c