thodg/cgminer

2013-11-15T09:41:01

Merge remote-tracking branch 'upstream' into new_protocol Conflicts: cgminer.c configure.ac miner.h