From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 22 Aug 2014 21:22:34 +0000 (+0200)
Subject: Merge branch 'feature/ZOL'
X-Git-Tag: collectd-5.5.0~218
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=68108d7b5688f4db5257a90437e50428a88d594a;p=collectd.git

Merge branch 'feature/ZOL'

Conflicts:
	configure.ac
---

68108d7b5688f4db5257a90437e50428a88d594a