From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 18 Dec 2015 20:46:14 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/collecty
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bffc1ca031d9969f27f4187448dd66e62b8a889e;p=collecty.git

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
---

bffc1ca031d9969f27f4187448dd66e62b8a889e