Code

Merge remote branch 'trenkel/collectd-4.10' into collectd-4.10
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 20 Jun 2010 16:02:39 +0000 (18:02 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 20 Jun 2010 16:02:39 +0000 (18:02 +0200)
commit96c474f576c721c6d993025b99c55de375552259
tree475e1192afaab956b15afcec3007e092dffe926b
parent3fc9dd157bb761c82718e1bc48543394da14db00
parent23308534a393a9186e1d64a9c0a6a82086cb0a57
Merge remote branch 'trenkel/collectd-4.10' into collectd-4.10