Code

Merge branch 'collectd-4.7' into collectd-4.8
authorFlorian Forster <octo@noris.net>
Wed, 21 Oct 2009 09:34:07 +0000 (11:34 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 21 Oct 2009 09:34:07 +0000 (11:34 +0200)
commit19a08d266f623d3697b5ca55689bd57eeaae46a6
treef052bdf0626e59e33a2d8aebb59b66ef715ee684
parent8ea23471ba3a464fce7bfcd46fb8d9b07f48d5ab
parentc1c52083b2a732269aa464c8ad0ce454cfbc01ce
Merge branch 'collectd-4.7' into collectd-4.8

Conflicts:
.gitignore
.gitignore