Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 14 Oct 2015 07:10:38 +0000 (09:10 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 14 Oct 2015 07:10:38 +0000 (09:10 +0200)
1  2 
src/python.c

diff --cc src/python.c
Simple merge