Commit f5c69237871b69a8b82edd4caf4e51bcf7342a02

Angus Gratton 2013-10-25T16:19:48

Merge branch 'master' of github.com:ckolivas/cgminer into new_protocol Conflicts: usbutils.c