Merge branch 'master' into hashfast Conflicts: Makefile.am api.c cgminer.c configure.ac miner.h usbutils.c usbutils.h
2013-09-30T08:43:29