author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Tue, 9 Mar 2010 15:55:20 +0000 (16:55 +0100) | ||
committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Tue, 9 Mar 2010 15:55:20 +0000 (16:55 +0100) | ||
commit | 0b02f790242b90e2a91102c7091e87cd3f6f5d76 | |
tree | fc02d47d07b404b09232929b011ddf5f488fbf55 | tree | snapshot |
parent | 35602ac111564b7908cfbe54c6fd85671f5623d5 | commit | diff |
parent | 2d0c4c77126d75a18bd4fff582a45f7fa313f845 | commit | diff |
Merge remote branch 'origin/collectd-4.8' into collectd-4.8