![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@huhu.verplant.org> | |
| Tue, 5 Jan 2010 10:55:28 +0000 (11:55 +0100) | ||
| committer | Florian Forster <octo@huhu.verplant.org> | |
| Tue, 5 Jan 2010 10:55:28 +0000 (11:55 +0100) | ||
| commit | 649197d3ed512b81472de0e8a1f310520c234b20 | |
| tree | 030f8ab82e6d83775694e10006de7064d2200b8c | tree | snapshot |
| parent | 13da81f864686e51b41a088edb63fd47d57806bd | commit | diff |
| parent | dedba5c8fb05a1b00b66a8bbc9eab9e0affe551f | commit | diff |
Merge commit 'trenkel/st/python'
Conflicts:
src/python.c
Conflicts:
src/python.c
| src/collectd-python.pod | diff1 | | diff2 | | blob | history |