Bugfix: Free old coinbase script before setting a new one
Bugfix: Parse userpass option with strchr rather than strtok to avoid usernameless passwords getting into the username field and being displayed
Merge commit 'e61da77' into bfgminer
Replace struct _cbscript_t with bytes_t for simplicity
util: bytes_eq and bytes_assimilate
pool_set_uri function
URI parameter #getcbaddr to request coinbase address from bitcoind or compatible servers
Merge branch 'auto_solomine' into bfgminer
Bugfix: Initialise struct pool in add_pool rather than halfway through startup
Merge commit '11c1b67' into bfgminer
Bugfix: In benchmark mode, only remove the new pools after putting them in the array, since the removal will try to remove it from the array
Merge branch '2014-benchmark' into bfgminer

Conflicts:
	miner.c
Defer determining --quit-summary default until it is needed, so hotplugged devices affect it
Merge commit 'ebc5acc' into bfgminer
Bugfix: Wake up wait_lpcurrent if its conditions for returning may have changed
Merge commit 'c548ca0' into bfgminer

Conflicts:
	miner.c
Minor refactor of text-only mode: avoid wasting bottom line of console, and save status lines as they are replaced by log items
Bugfix: Use int rather than ssize_t to type-match %d expectation
Merge branch 'stratum_requiretls' into bfgminer
Workaround GCC 4.6 initialisation bugs with BYTES_INIT