From: Florian Forster Date: Sun, 13 Jun 2010 13:35:27 +0000 (+0200) Subject: Merge remote branch 'jeromer/master' into jr/varnish X-Git-Tag: collectd-5.0.0-beta0~103^2~2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=019f71b91cdbe9f84438404bdb6a207ae859becd;p=collectd.git Merge remote branch 'jeromer/master' into jr/varnish --- 019f71b91cdbe9f84438404bdb6a207ae859becd