Commit b431ea4e1f7e30735b879d9cc20c3bdb6b180e1b

Con Kolivas 2013-10-31T12:09:23

Merge branch 'master' into kncminer