From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 22 Jul 2006 20:38:29 +0000 (+0200)
Subject: Merge branch 'origin'
X-Git-Tag: collectd-3.11.0~73
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=533dba5626961fae399a4523837bdf7523692e78;p=collectd.git

Merge branch 'origin'
---

533dba5626961fae399a4523837bdf7523692e78