Code

Merge remote-tracking branch 'github/pr/1088' into collectd-5.4
authorFlorian Forster <octo@collectd.org>
Wed, 17 Jun 2015 07:12:08 +0000 (09:12 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 17 Jun 2015 07:12:08 +0000 (09:12 +0200)
commit7909156126916e6fd6ad97fa45b2a8391c78ba22
treea010703cdbc1375a55e0787c00145f6332563b38
parent707fa6cb057b53846aaa27a505fe05226612ecd3
parent33819a49ab40ec2f54f5ee12b3b88ab4205873eb
Merge remote-tracking branch 'github/pr/1088' into collectd-5.4