Code

Merge commit 'trenkel/st/python'
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 10:55:28 +0000 (11:55 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 10:55:28 +0000 (11:55 +0100)
Conflicts:

src/python.c

1  2 
src/collectd-python.pod

Simple merge