Code

Merge branch 'collectd-4.4'
authorFlorian Forster <octo@noris.net>
Tue, 29 Apr 2008 15:45:16 +0000 (17:45 +0200)
committerFlorian Forster <octo@noris.net>
Tue, 29 Apr 2008 15:45:16 +0000 (17:45 +0200)
commitd98487a27d294e31f483b9d43e0d6c02717d248c
treefe0b6e4aeca2549a4e998c5df2bf3a7009570a84
parent6b49eec15d421a74935fb1165c3e9fdb80ca838e
parent0aad516f24e861109627f4b1dc5bfea3b1f621c1
Merge branch 'collectd-4.4'

Conflicts:

src/sensors.c
src/sensors.c