Merge branch 'collectd-5.2' into collectd-5.3
authorFlorian Forster <octo@collectd.org>
Fri, 12 Jul 2013 16:21:31 +0000 (18:21 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 12 Jul 2013 16:21:31 +0000 (18:21 +0200)
commitbc389fa32a48a64306f7ec008f4548f05fdb7c80
treebdf00f2b59cfd54c3a064d245c240d4c2946d8ec
parent6770685f935fb8599adac60b2d5c84b65d579b4c
parentbfd3f06ef4996707036756371c5724ebf2748821
Merge branch 'collectd-5.2' into collectd-5.3
src/common.c
src/rrdcached.c
src/rrdtool.c