![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Sven Trenkel <collectd@semidefinite.de> | |
| Wed, 19 May 2010 08:58:01 +0000 (10:58 +0200) | ||
| committer | Florian Forster <octo@noris.net> | |
| Wed, 19 May 2010 08:58:01 +0000 (10:58 +0200) | ||
| commit | fabc18dac7e676b4e6577bcb6880d501dccc5b31 | |
| tree | 6efd0cdb69a606bd8d83678ce887b117ff020728 | tree | snapshot |
| parent | 7970f59dff204401069cfc53f7c53f207a681428 | commit | diff |
| parent | 63f424212ca2bf3472af842a68881a7a58e86d44 | commit | diff |
Merge branch 'collectd-4.9' into collectd-4.10
Conflicts:
src/python.c
Conflicts:
src/python.c
| configure.in | diff1 | | diff2 | | blob | history |
| src/python.c | diff1 | | diff2 | | blob | history |