Code

Merge branch 'pr/1033'
authorFlorian Forster <octo@collectd.org>
Sat, 6 Jun 2015 19:39:16 +0000 (21:39 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 6 Jun 2015 19:39:16 +0000 (21:39 +0200)
commit3f9f6b9bc37cfd8ee3eb7a21cb895ff524c533c8
treef38977bc4f4723442d4a7877ccd2e0e1aa44a54e
parentdab784c8654141e90dfaf767efa05cae5cfdae80
parent2c6f2a6c9ccfe8cfe4f605683e0e2e365da11f82
Merge branch 'pr/1033'