Merge branch 'collectd-5.0'
authorFlorian Forster <octo@collectd.org>
Sat, 28 Jan 2012 11:26:51 +0000 (12:26 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 28 Jan 2012 11:26:51 +0000 (12:26 +0100)
commit081695d86026186373a76a4c6b6abacd21b3c3c6
tree41b8b54dce0e43574cb6ac203a243289c0950fa7
parentdba49453a9ca7ece471c3136b56b8440e7cc7fbe
parent4ecefb9fb8183eadee48538553615c0425e51f69
Merge branch 'collectd-5.0'
configure.in
src/Makefile.am
src/collectd.conf.in