Code

Merge branch 'collectd-5.4'
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 24 Feb 2015 09:02:58 +0000 (10:02 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 24 Feb 2015 09:02:58 +0000 (10:02 +0100)
commitdd8429c16bc57f949abb2537e003b76ad88b6f90
tree15eab90f255ca3bd454e4f7cd764d64a7ecb6cbf
parentfd3acd001229e60a0bb34dead326d3dc003ab1fd
parent587f01f89af11c4acebbec44293528b77c779218
Merge branch 'collectd-5.4'

Conflicts:
src/Makefile.am
src/write_http.c
contrib/redhat/collectd.spec
src/collectd.conf.pod