Merge remote-tracking branch 'github/pr/1931'
authorFlorian Forster <octo@collectd.org>
Wed, 14 Sep 2016 11:59:05 +0000 (13:59 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 14 Sep 2016 11:59:05 +0000 (13:59 +0200)
1  2 
src/apache.c

diff --cc src/apache.c
Simple merge