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)
commitbffc1ca031d9969f27f4187448dd66e62b8a889e
tree83d4a24714c78fe86e4e97c04680d87881dc7504
parent03ba56309b43e6c599193059cdcd4bf11d926782
parent62956446985aae33fe718a51ae6105daa8aa531c
Merge branch 'master' of ssh://git.ipfire.org/pub/git/collecty

Conflicts:
src/collecty/plugins/base.py
src/collecty/plugins/cpufreq.py
src/collecty/plugins/sensors.py
src/collecty/plugins/sensors.py