Merge branch 'collectd-4.4' into collectd-4.5
authorFlorian Forster <octo@noris.net>
Fri, 28 Nov 2008 11:00:03 +0000 (12:00 +0100)
committerFlorian Forster <octo@noris.net>
Fri, 28 Nov 2008 11:00:03 +0000 (12:00 +0100)
commit68ab7da7a51018a00e6e03347182b988a30296a7
tree021a7a07cde5d842db1727f5891b3d141f00b002
parente628f39838a67b40d52dfb8425b4d8474fbd0550
parent3e429a6d86ac6a0afe31f31b3d4417bc43dd979e
Merge branch 'collectd-4.4' into collectd-4.5
contrib/collection.cgi
src/multimeter.c