Merge branch 'collectd-4.3' into collectd-4.4
authorFlorian Forster <octo@noris.net>
Tue, 29 Apr 2008 15:44:26 +0000 (17:44 +0200)
committerFlorian Forster <octo@noris.net>
Tue, 29 Apr 2008 15:44:26 +0000 (17:44 +0200)
commit0aad516f24e861109627f4b1dc5bfea3b1f621c1
tree3efd8c0300e52599f9431bafde60f8942df7755f
parent409d90064967451241f5fcc672a26269142e1735
parentc74b709edf61a3b7dfc24032f609956f0feb56e7
Merge branch 'collectd-4.3' into collectd-4.4
configure.in
contrib/migrate-3-4.px
src/Makefile.am
src/sensors.c