Merge branch 'sh/collectd-4.5' into sh/collectd-4.6
authorSebastian Harl <sh@tokkee.org>
Sat, 7 Mar 2009 17:03:42 +0000 (18:03 +0100)
committerSebastian Harl <sh@tokkee.org>
Sat, 7 Mar 2009 17:03:42 +0000 (18:03 +0100)
commit6d86a97190a193863aadc252f20f6b9dba61c263
treebff1eeb4030f4f67306bd97f87e8e50c06467a76
parent49cf50f058fc3a7322899b4eca4223dd71bc605a
parent54fb57fbc5658fc3d150219d07d840178d64d087
Merge branch 'sh/collectd-4.5' into sh/collectd-4.6

Conflicts:
contrib/collection3/lib/Collectd/Graph/Common.pm
src/postgresql_default.conf
README
src/postgresql_default.conf
src/rrdtool.c
src/snmp.c