Code

Merge branch 'collectd-4.1' into collectd-4.2
authorFlorian Forster <octo@noris.net>
Tue, 30 Oct 2007 16:19:04 +0000 (16:19 +0000)
committerFlorian Forster <octo@noris.net>
Tue, 30 Oct 2007 16:19:04 +0000 (16:19 +0000)
Conflicts:

src/collectd-snmp.pod

1  2 
src/collectd-snmp.pod
src/types.db

Simple merge
diff --cc src/types.db
Simple merge