Merge branch 'master' of ssh://git.ipfire.org/pub/git/collecty
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 18 Dec 2015 20:46:14 +0000 (21:46 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 18 Dec 2015 20:46:14 +0000 (21:46 +0100)
Conflicts:
src/collecty/plugins/base.py
src/collecty/plugins/cpufreq.py
src/collecty/plugins/sensors.py

1  2 
src/collecty/plugins/sensors.py

Simple merge