Merge branch 'collectd-4.10' into collectd-5.0
authorFlorian Forster <octo@collectd.org>
Sat, 28 Jan 2012 11:26:41 +0000 (12:26 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 28 Jan 2012 11:26:41 +0000 (12:26 +0100)
commit4ecefb9fb8183eadee48538553615c0425e51f69
tree43a41520ae059e872462c6b3460631a7d469d2d0
parenta24bf968e72f9a103a354dcc833619a40849cfcd
parent5ebd1dfbd1d70fc7de6b4a45c3e861202bbdc75b
Merge branch 'collectd-4.10' into collectd-5.0
README
configure.in
src/Makefile.am
src/common.c
src/ipvs.c
src/oracle.c
src/python.c