Code

Merge branch 'collectd-4.4' into collectd-4.5
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 16 Oct 2008 20:13:33 +0000 (22:13 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 16 Oct 2008 20:13:33 +0000 (22:13 +0200)
commitfd9c88963b04c9e9050a952ba0f018493e8b7638
treedf6a9975563bab50c7fd45fc467e07b01e570cf4
parent1d3be23f9d6474a6f8e530904df4f27569b6ddc5
parentda27344d819e431e74b15a638c91f8d0ff44125d
Merge branch 'collectd-4.4' into collectd-4.5

Conflicts:

ChangeLog
version-gen.sh
ChangeLog
contrib/collection.cgi
src/Makefile.am
src/collectd.h
src/perl.c
src/types.db