Code

Merge branch 'collectd-5.3'
authorFlorian Forster <octo@collectd.org>
Sun, 18 Aug 2013 10:14:39 +0000 (12:14 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 18 Aug 2013 10:14:39 +0000 (12:14 +0200)
commitc27675331d874c85625d2e64ebcc229db588c5f2
tree7c121f2333842890b2eb988c355981bb5f614ede
parentbdf4ac4bba349bac128fea28fac13fda784ae78c
parentc023314cc01ec8fae3f5373aa9dbf2b2a2d339b3
Merge branch 'collectd-5.3'

Conflicts:
configure.in
configure.in
src/memcached.c
src/rrdtool.c