Merge commit '1ec9747' into bfgminer-3.10.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 20 Mar 2014 21:19:25 +0000 (21:19 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 20 Mar 2014 21:19:25 +0000 (21:19 +0000)
commitbe2a3e946d4346a96af1004c3f8ab5d4bcb14e59
treed5657e7c4c94920934593af4a30a2f58ccdb7745
parenta45b05ce4a5b96cdf00a9554b39840ddb632b97b
parent1ec974754326e0b65ea4d17612046b07299d9bab
Merge commit '1ec9747' into bfgminer-3.10.x
miner.c