Merge branch 'master' into collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 10 Apr 2007 15:23:13 +0000 (17:23 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 10 Apr 2007 15:23:13 +0000 (17:23 +0200)
commit06adec208286b5a136ffa5c5f3832c35e9f62844
tree759a7e1a37e6b328128b193c6c09cea30e24128e
parenta432a981a00224528dcba09f82cc85f1fe58d9a4
parentbb743c17dda8f0c51828c62a7b8ec98bdaa9bfcf
Merge branch 'master' into collectd-4

Conflicts:

configure.in
ChangeLog