Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 15 Jun 2015 19:18:04 +0000 (21:18 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 15 Jun 2015 19:18:04 +0000 (21:18 +0200)
commitf664b944f774e4d1e5d5c562eaf0bb207c6a7edf
tree10ada45ad6a28c80cc108b8faa7d1fd35db6628d
parent33b6aff71496fcab04a307d8e9c02259c58bfec1
parentea7a1f41eb1d32fa881658db871b4006a17cb980
Merge branch 'collectd-5.4' into collectd-5.5

Conflicts:
src/write_redis.c
configure.ac
src/collectd.conf.pod
src/write_redis.c