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)
commit649197d3ed512b81472de0e8a1f310520c234b20
tree030f8ab82e6d83775694e10006de7064d2200b8c
parent13da81f864686e51b41a088edb63fd47d57806bd
parentdedba5c8fb05a1b00b66a8bbc9eab9e0affe551f
Merge commit 'trenkel/st/python'

Conflicts:

src/python.c
src/collectd-python.pod