Code

Merge branch 'collectd-4.6' into collectd-4.7
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 10 May 2009 15:24:50 +0000 (17:24 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 10 May 2009 15:24:50 +0000 (17:24 +0200)
commit9ce08d6e5e67d89e29a21883bdca5b79d1f908a9
tree6291c08bb39339382593a4bde57cd49f2e9abb35
parentf71895576cbd4b488cd66f0c96efb6fd3e7a6faf
parent108068f268cad453e5d3b54e288917409db1e467
Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
ChangeLog
ChangeLog