Code

Merge remote branch 'tokkee/sh/collectd-4.7' into collectd-4.7
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 11 May 2009 14:18:22 +0000 (16:18 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 11 May 2009 14:18:22 +0000 (16:18 +0200)
commit568006186417f6b2404790969599f4cd0d2eee22
tree05c5c440596b61220b2932b4d83cc2fc40a2a0d5
parent818ece50e85249bfda8ff6c1daf7a289ead453a2
parent5c0fa3a926340546d1f3e807e6fb8a6feae52179
Merge remote branch 'tokkee/sh/collectd-4.7' into collectd-4.7