Code

Merge branch 'collectd-4.9' into collectd-4.10
authorSven Trenkel <collectd@semidefinite.de>
Wed, 19 May 2010 08:58:01 +0000 (10:58 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 19 May 2010 08:58:01 +0000 (10:58 +0200)
commitfabc18dac7e676b4e6577bcb6880d501dccc5b31
tree6efd0cdb69a606bd8d83678ce887b117ff020728
parent7970f59dff204401069cfc53f7c53f207a681428
parent63f424212ca2bf3472af842a68881a7a58e86d44
Merge branch 'collectd-4.9' into collectd-4.10

Conflicts:
src/python.c
configure.in
src/python.c