Code

Merge branch 'collectd-5.2' into collectd-5.3
authorFlorian Forster <octo@collectd.org>
Sun, 18 Aug 2013 10:13:48 +0000 (12:13 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 18 Aug 2013 10:13:48 +0000 (12:13 +0200)
1  2 
configure.in
src/rrdcached.c
src/rrdtool.c

diff --cc configure.in
Simple merge
diff --cc src/rrdcached.c
Simple merge
diff --cc src/rrdtool.c
Simple merge