nothing
Merge branch 'master' of github.com:vitaminmoo/cgminer2rrd

Conflicts:
	clocks.py
Merge branch 'master' of github.com:vitaminmoo/cgminer2rrd
Merge branch 'master' of github.com:vitaminmoo/cgminer2rrd
Merge branch 'master' of github.com:vitaminmoo/cgminer2rrd
Merge branch 'master' of github.com:vitaminmoo/cgminer2rrd
change card number
Merge branch 'master' of github.com:vitaminmoo/cgminer2rrd
Merge branch 'master' of github.com:vitaminmoo/cgminer2rrd
Merge branch 'master' of github.com:vitaminmoo/cgminer2rrd
Merge branch 'master' of github.com:vitaminmoo/cgminer2rrd
Merge branch 'master' of github.com:vitaminmoo/cgminer2rrd
set stepsizes
Merge branch 'master' of github.com:vitaminmoo/cgminer2rrd
Merge branch 'master' of github.com:vitaminmoo/cgminer2rrd
nothingness
Merge branch 'master' of github.com:vitaminmoo/cgminer2rrd

Conflicts:
	clocks.py
Merge branch 'master' of github.com:vitaminmoo/cgminer2rrd