Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 26 Jun 2015 06:09:47 +0000 (08:09 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 26 Jun 2015 06:09:47 +0000 (08:09 +0200)
commit3b227016c5e2126d5064c19d29ab79f13a187b39
tree4f08a7b884bd35223add09b0b97ae9c86608fc6b
parent88f22ff8b4c69eb38b6aaab30df212df1871d4ec
parentba5d00054e24261b3b8cbbef56dc6e6ae54f61bc
Merge branch 'collectd-5.5'

Conflicts:
src/write_redis.c
src/write_redis.c