Code

Merge remote-tracking branch 'octo/master'
authorSven Trenkel <collectd@semidefinite.de>
Sun, 16 Jul 2017 22:49:59 +0000 (22:49 +0000)
committerSven Trenkel <collectd@semidefinite.de>
Sun, 16 Jul 2017 22:49:59 +0000 (22:49 +0000)
1  2 
src/python.c

diff --cc src/python.c
Simple merge