Code

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)
1  2 
src/common.c
src/rrdcached.c
src/rrdtool.c

diff --cc src/common.c
Simple merge
diff --cc src/rrdcached.c
Simple merge
diff --cc src/rrdtool.c
Simple merge