Merge branch 'collectd-4.1' into collectd-4.2
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 27 Dec 2007 10:15:30 +0000 (11:15 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 27 Dec 2007 10:15:30 +0000 (11:15 +0100)
commit1a8ae6734a9351097943dd1ce019a8d95b72c3d1
tree1f94e4c6bc30c0aa0cc7bc6bb96697a15805ec56
parent61f5c1a972626212aab60c4d50f45097485b8e51
parent973b0ccad8b6b2c42165b286a847d1485c369023
Merge branch 'collectd-4.1' into collectd-4.2

Conflicts:

ChangeLog
version-gen.sh
ChangeLog