Merge branch 'collectd-4.5'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 16 Feb 2009 11:48:22 +0000 (12:48 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 16 Feb 2009 11:48:22 +0000 (12:48 +0100)
commit6597f3a6584704f92f824f3cf7bac3369102e8a0
tree7a7cd9ca371861d757db7433b84b5d4e737cbce6
parent453d1a73480b2422ce83cdbdf1c8e5fc5037e3ce
parent7c8fb05fcb919fb2d9fc68757c198916396600ce
Merge branch 'collectd-4.5'

Conflicts:

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