Merge branch 'collectd-3.11'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 10 Apr 2007 15:21:49 +0000 (17:21 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 10 Apr 2007 15:21:49 +0000 (17:21 +0200)
commitbb743c17dda8f0c51828c62a7b8ec98bdaa9bfcf
tree6957bbee0b82b1c5c2f98ca8d0c9449e80b7a680
parent1e7a1563af4e3a82e2f2e017dcabe9616624175d
parent84fa07ad0de81d0b1521e4badacde74a4af238c1
Merge branch 'collectd-3.11'

Conflicts:

ChangeLog
ChangeLog
configure.in