Merge remote-tracking branch 'github/pr/2135'
authorFlorian Forster <octo@collectd.org>
Wed, 11 Oct 2017 12:46:43 +0000 (14:46 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 11 Oct 2017 12:46:43 +0000 (14:46 +0200)
1  2 
src/collectd-python.pod
src/python.c

Simple merge
diff --cc src/python.c
Simple merge