Code

Merge branch 'collectd-5.3' into collectd-5.4
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 3 Mar 2015 23:39:09 +0000 (00:39 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 3 Mar 2015 23:39:09 +0000 (00:39 +0100)
commit27aeac9988dde1d53e5df697ce0e1b8a951d091a
tree2aaa9572ad0ec54dedbb8d49e286a330965cf052
parentadd4647f5dbd0e0d3d0c95903c644f9dcafee33b
parent584482eb34e3dc0d007922a80c7c39657dca7235
Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
configure.ac
configure.ac
src/plugin.c