Commit 707349391150aba070ab94f580b9c963ab6e8fff

Con Kolivas 2011-07-19T01:46:16

Merge branch 'cgminer' into pools Conflicts: main.c