From: Sebastian Harl <sh@tokkee.org>
Date: Sun, 15 Sep 2013 11:30:18 +0000 (+0200)
Subject: Merged branch 'mf/master'.
X-Git-Tag: collectd-5.4.0-1~26
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c38ca79e1cdece35384cefe90bae15f4553a291a;p=pkg-collectd.git

Merged branch 'mf/master'.
---

c38ca79e1cdece35384cefe90bae15f4553a291a