Merge branch 'collectd-5.3' into collectd-5.4
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Jan 2014 17:28:07 +0000 (18:28 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Jan 2014 17:28:07 +0000 (18:28 +0100)
commit54ef2ae58f8ef125cf1d3aefe3ac839ba7e67f8a
treeee34f28088fe3f29c833adfb320ac2e92199699f
parentd9c851256eec5fa49821c6f1a7f3381c90850a71
parentaffac33e83584e7538c358e3bd0a587d0c692bc3
Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
src/zfs_arc.c
configure.ac
src/Makefile.am
src/collectd.conf.pod
src/curl.c
src/curl_json.c
src/types.db
src/zfs_arc.c