Commit b3b1ddff66e872e42209aea9a5417c02222d8d9d

Con Kolivas 2014-02-21T07:52:38

Merge branch 'avalon2' of https://github.com/xiangfu/cgminer into xiangfu-avalon2 Conflicts: api.c configure.ac