Merge branch 'master' of github.com:ckolivas/cgminer into new_protocol Conflicts: configure.ac miner.h usbutils.c usbutils.h
2013-11-05T10:19:11