Merge branch 'master' into ff/rrdcached
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 14 Sep 2008 14:25:08 +0000 (16:25 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 14 Sep 2008 14:25:08 +0000 (16:25 +0200)
commit4765d9e4ae24157cc8772a30fea949b33f5a3e94
tree8574aaf919c438749541750ef29f270ec7441dfe
parent2f95b0626881d8ed2a2c0675a1a4767db486ef03
parenta791a086aaa1d90e6f6b70d34cb106ab38ae2859
Merge branch 'master' into ff/rrdcached

Conflicts:

src/rrdtool.c
configure.in
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod
src/rrdtool.c
src/types.db