Merge pull request #2346 from trenkel/master

Add CollectdError exception which can be thrown without causing a stacktrace to be logged.

diff --cc src/collectd-python.pod
Simple merge

diff --cc src/cpython.h
Simple merge

diff --cc src/python.c
Simple merge

diff --cc src/pyvalues.c
Simple merge