Merge pull request #890 from trenkel/master

author trenkel <github@semidefinite.de>

Sun, 15 Feb 2015 15:34:09 +0000 (16:34 +0100)

committer trenkel <github@semidefinite.de>

Sun, 15 Feb 2015 15:34:09 +0000 (16:34 +0100)
author trenkel <github@semidefinite.de>
Sun, 15 Feb 2015 15:34:09 +0000 (16:34 +0100)
committer trenkel <github@semidefinite.de>
Sun, 15 Feb 2015 15:34:09 +0000 (16:34 +0100)
diff --cc src/collectd-python.pod
Simple merge
diff --cc src/python.c
Simple merge
author	trenkel <github@semidefinite.de>
	Sun, 15 Feb 2015 15:34:09 +0000 (16:34 +0100)
committer	trenkel <github@semidefinite.de>
	Sun, 15 Feb 2015 15:34:09 +0000 (16:34 +0100)
		1	2
src/collectd-python.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/python.c	patch \|	diff1 \|	diff2 \|	blob \| history