Merge branch 'collectd-5.3' into collectd-5.4
authorFlorian Forster <octo@collectd.org>
Wed, 10 Sep 2014 15:15:24 +0000 (17:15 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 10 Sep 2014 15:15:24 +0000 (17:15 +0200)
1  2 
src/common.c

diff --cc src/common.c
Simple merge