From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 5 Jan 2010 10:55:28 +0000 (+0100)
Subject: Merge commit 'trenkel/st/python'
X-Git-Tag: collectd-4.10.0~76
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=649197d3ed512b81472de0e8a1f310520c234b20;p=collectd.git

Merge commit 'trenkel/st/python'

Conflicts:

	src/python.c
---

649197d3ed512b81472de0e8a1f310520c234b20