Merge branch 'master' into collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 15 Mar 2007 17:33:12 +0000 (18:33 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 15 Mar 2007 17:33:12 +0000 (18:33 +0100)
commitd561a8387f633491bdcd7fe6964f0b63ae694af5
tree165e9d28c88719260286161c860025b71528a583
parent5bc935fb1fd57cb9048660740c3d62606964f76c
parent35248bcc734467e1f1ae39b4a6470849e57624bf
Merge branch 'master' into collectd-4

Conflicts:

configure.in
configure.in
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod