Code

Merge branch 'collectd-4.7' into collectd-4.8
authorFlorian Forster <octo@noris.net>
Wed, 13 Jan 2010 11:10:20 +0000 (12:10 +0100)
committerFlorian Forster <octo@noris.net>
Wed, 13 Jan 2010 11:10:20 +0000 (12:10 +0100)
commit8be9c73cc216609a54a1b997aad8a3d646a0a43f
tree7474ba03f35184cd0c2b0a80c63fc262c50fe59d
parent0b4f63782617b308abf908fbb2fc7ec9afe039db
parente9d25ecf27dba41c69e8d1e9cbe5223cf284bd60
Merge branch 'collectd-4.7' into collectd-4.8